Trunk revnos have become dotted

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 4/8/2011 4:32 PM, Gordon Tyler wrote:
> On Fri, 08 Apr 2011 16:17:26 +0200, John Arbash Meinel
> <john at arbash-meinel.com> wrote:
>> If someone pushes a local branch 'over-top' the trunk branch. For
> example:
>>
>> trunk: A - B
>>         \   \
>> feature: C - D
>>
>> At this point, some can do:
>>
>> cd feature
>> bzr push ../trunk
>>
>> And then trunk's history will look exactly like features.
> 
> The thing is, I'm the only developer on this project and I don't recall
> every doing that. I've always merged from branches to trunk. I have been
> experimenting with using rebasing on the branches. But I only ever do
> merges to trunk. I think I may have merged from trunk to a branch that had
> previously been rebased. Would this confuse things?
> 
>> So we do have a flag "append_revisions_only=True" which can be set in
>> .bzr/branch/branch.conf. (New versions of bzr should let you do it with
>> something like: "bzr config append_revisions_only=True".
> 
> Will this fix a repo which is currently in this state?
> 

No, you already have revision "D" as your tip. What you can do, is sort
out what rev B is, and then:

bzr branch -r B ../new-trunk
cd new-trunk
bzr merge ../old-trunk
bzr commit -m "New tip"
bzr push ../old-trunk
cd ../old-trunk
bzr config append_revisions_only=True

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk2fHP4ACgkQJdeBCYSNAAObCgCdGLGbg1b/5SsHUe8OegZhv7fd
z/8AnRwSRdHuB5HBqNNZLtiSCA6UIiu0
=Q7ec
-----END PGP SIGNATURE-----