Re: Bzr document unclear. There is no "conflict markers".

[Bojan Nikolic <bojan@bnikolic.co.uk>]

[-- Attachment #1: Type: text/plain, Size: 656 bytes --]


Richard Stallman <rms@gnu.org> writes:

> The concept of "accepted into the trunk" puzzles me.  If someone has
> write access, he can install his changes into the trunk, right?  So if
> he has committed all his past changes, there's nothing to merge --
> right?
>
> Are you assuming the case of a person who doesn't have write access
> on Savannah?

Yes, I assumed this was the case, i.e., the developer of the quick-fix
sends his fix using the "bzr send" command and it isn't immediately
integrated onto the trunk. 

To be more concrete, here is a little shell script which illustrates
this scenario and error message you get if you do not use "merge".


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: t1.sh --]
[-- Type: text/x-sh, Size: 1664 bytes --]

# Example for user without write access

# This branch represnts the true upstream trunk
bzr init upstream-trunk
# Add a first revision to trunk 
(cd upstream-trunk && bzr commit --unchanged -m "Base rivision")

# This is the users' version of the trunk
bzr branch upstream-trunk trunk
(cd trunk && bzr bind  ../upstream-trunk)

# This is the user's quickfixes branch
bzr init quickfixes

# Normal development continues on upstream-trunk...
(cd upstream-trunk && bzr commit --unchanged -m "Other peoples revision #1")
(cd upstream-trunk && bzr commit --unchanged -m "Other peoples revision #2")

# Now user wants to make a quick fix:
(cd trunk && bzr update)

# In this case, bzr pull works, because although there are new
# revisions in trunk, they all follow the last revision in quickfixes
# and so there isn't a divergance
(cd quickfixes && bzr pull ../trunk && bzr commit --unchanged -m "My fix #1")

# At this point the user would send their fix
# ( cd quickfixes && bzr send <email address>)

# Now assume the fix is not integrated on the upstream-trunk, but that
# development continues:
(cd upstream-trunk && bzr commit --unchanged -m "Other peoples revision #3")

# The developer wants to make another quick-fix. First update as before
(cd trunk && bzr update)
# Now, if (s)he tries to pull this will not work:
(cd quickfixes && bzr pull ../trunk && bzr commit --unchanged -m "My fix #2")
# The above does not work, because of divergance. You can visualise as:
(cd quickfixes && bzr graph-ancestry --no-collapse --merge-branch=../trunk quickfixes.png)

# But Merge will work
(cd quickfixes && bzr merge ../trunk && bzr commit --unchanged -m "My fix #2")

[-- Attachment #3: Type: text/plain, Size: 28 bytes --]


The graph it produces is:


[-- Attachment #4: Graph of revisions in the quickfixes and trunk branches, showing \"divergance\" --]
[-- Type: image/png, Size: 20792 bytes --]

[-- Attachment #5: Type: text/plain, Size: 188 bytes --]


The graph shows the "divergance" of the histories and the requirement
for merge. Hope it makes it clearer.

Best,
Bojan


-- 
Bojan Nikolic          ||          http://www.bnikolic.co.uk