Trunk revnos have become dotted

[John Arbash Meinel]

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

On 4/8/2011 4:09 PM, Gordon Tyler wrote:
> What would cause my trunk branch's revnos to become dotted and one of my
> branches' revnos to become single numbers?
> 
> How do I fix this? Do I need to fix it?
> 
> Thanks,
> Gordon
> 
> 

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.

Note that no-revisions are lost, B (the old trunk tip) is still in the
history. However, it is no longer in the left-hand history (mainline).
Which means it doesn't show up in "bzr log -n1", etc.

Often, preserving mainline has nice side-effects. (Convenient summaries
about when code landed on a given branch, especially trunk, etc.)

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".

At that point, we would refuse pushing "D" into trunk. Instead, someone
has to do:

cd trunk
bzr merge ../feature
bzr commit -m "merge feature"

Which creates the graph:

trunk: A - B - E
        \   \ /
feature: C - D

Some people feel E revisions are ugly, others like them a lot (we
generally encourage them in bzr).

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

iEYEARECAAYFAk2fGPYACgkQJdeBCYSNAAO4jwCcDMFXdnrKlHmSz3G9/q2ZqdFn
amMAn0E2UeaeSZkKW0O+Ttn8UDl0O1hB
=OQbc
-----END PGP SIGNATURE-----