Commit comments when merging
Jelmer Vernooij
jelmer at vernstok.nl
Wed Feb 11 16:27:46 GMT 2009
On Thu, Feb 12, 2009 at 01:20:18AM +0900, David Muir wrote:
> Jelmer Vernooij wrote:
>> On Wed, Feb 11, 2009 at 10:46:29PM +0900, David Muir wrote:
>>> I gave bz svn-push --merged a whirl, but it just sat there, chugged,
>>> for a while, then nothing. No errors, but it didn't do anything
>>> either (that I could see). Maybe it's my setup that's wrong...
>>> Here's how I'm set up:
>>> SVN repo on the interwebs
>>> Local checkout of svn repo ~/repos/svn/myProj/trunk
>>> Local development branch of local checkout ~/www/myProj
>>> I commit a couple revs to the local development branch
>>> ~/www/myProj/bzr commit
>>> I then merge those into the local checkout:
>>> ~/repos/svn/myProj/trunk/bzr merge ~/www/myProj
>>> Then I ran: ~/repos/svn/myProj/trunk/bzr svn-push --merged
>>> svn+ssh://pathToRepo
>> What version of bzr-svn are you using? Also, please specify a
>> svn+ssh://pathToRepo/trunk rather than just the repository root to
>> svn-push.
> I'm using bzr 1.11 + bzr-svn 0.53CtWeWmj
> And, yes I'm pushing to pathToRepo/trunk
> The server is running svn 1.4.2
Any chance you can run with -Dtransport to see what it's doing? It
should write debug output to ~/.bzr.log.
Cheers,
Jelmer
--
Jelmer Vernooij <jelmer at samba.org> - http://jelmer.vernstok.nl/
17:27:24 up 40 days, 20:15, 1 user, load average: 1.13, 1.31, 1.55
More information about the bazaar
mailing list