Broken branch from svn

Ivan Sagalaev maniac at softwaremaniacs.org
Mon Nov 2 14:20:51 GMT 2009


Jelmer Vernooij wrote:
> It will put the new branches in the branches/ directory in the
> repository, and try to find a good name to use. If available it will use
> the branch nick that is set on the commits.
> 
> The configuration option is a boolean that can be set in the global
> Bazaar configuration, in locations.conf or in ~/.bazaar/subversion.conf.

Jelmer, hello again!

I've tried experimenting with push_merged_revisions but with no luck. 
This is what I have in ~/.bazaar/subversion.conf:

locations = svn+ssh://svn.yandex.ru/lenta-ng
guessed-layout = trunk0
branches = branches/bzr/*;trunk/lenta_ng
tags = tags/*
push_merged_revisions = True

The line in "branches" lists branches subdirectory for bzr experiments 
and the trunk. Hope I didn't screw up with this :-).

bzr svn-layout svn+ssh://svn.yandex.ru/lenta-ng says:

Repository root: svn+ssh://svn.yandex.ru/lenta-ng
Layout: WildcardLayout(['branches/bzr/*', 'trunk/lenta_ng'],['tags/*'])

Locally in a bzr repo I have:

- trunk -- a checkout of "trunk/lenta_ng" (which is the trunk)
- test2 -- a local branch with a nick "test2"

After merging from test2 to trunk and committing -- merged revisions 
don't appear at the svn server.

bzr log on trunk:

revno: 526 [merge]
committer: Ivan Sagalaev <isagalaev at yandex-team.ru>
branch nick: trunk/lenta_ng
timestamp: Mon 2009-11-02 16:58:02 +0300
message:
   merge Врагу не сдаётся наш гордый Варяг!
     ------------------------------------------------------------
     revno: 522.1.3
     committer: Ivan Sagalaev <isagalaev at yandex-team.ru>
     branch nick: test2
     timestamp: Mon 2009-11-02 16:51:54 +0300
     message:
       Врагу не сдаётся наш гордый Варяг!
------------------------------------------------------------

svn log on repository:

------------------------------------------------------------------------
r7179 | isagalaev | 2009-11-02 16:58:15 +0300 (Mon, 02 Nov 2009) | 2 lines
Changed paths:
    M /trunk/lenta_ng
    M /trunk/lenta_ng/wd_lenta_ng_interface.sh

merge Врагу не сдаётся наш гордый Варяг!

What to check next?



More information about the bazaar mailing list