merge vs pull

[John Arbash Meinel]

Kevin Smith wrote:
> John Arbash Meinel wrote:
> 
>> Kevin Smith wrote:
>>
>>>
>>> That sounds like it would have to do a merge. First, the archive would
>>> be updated, but then the working tree also needs to be updated to
>>> include the just-pulled changes. What if those newly pulled changes
>>> conflict with my changes?
>>
>>
>>
>> Then you have conflicts in you working tree. Think of it more like "cvs
>> update". Before you can commit, you have to be up to date (in our case
>> it isn't have-to it is want-to). You want to resolve conflicts before
>> you commit, and you always want to be up-to-date.
> 
> 
> Ok. So pull should (maybe already does) tell the user if there were
> conflicts, and describe how the user could find them. Maybe with a
> --verbose or --show-conflicts option that would list all the files that
> had conflicted. Those will now have >>>>> conflict markers, right?
> 
> I think I "get it". It would be great to get full descriptions of pull
> and merge up on the wiki, or somewhere online.

I'm pretty sure it does report conflicts. It puts the herringbone
conflict markers, along with leaving a .BASE .THIS .OTHER files, and
preventing you from committing until you resolve the conflicts "using
bzr resolve [foo | --all]".
Same as merge does.

You can also always use: bzr conflicts
To see what files are conflicted.

> 
>> With bound branches and checkouts, we will allow the user to declare
>> explicitly that they have to be up-to-date. (The commit will fail if out
>> of date).
> 
> 
> Yes, I think that's a great feature.

I had an implementation of bound branches, but it was deemed to sneaky,
so I'm rewriting it right now. Of course I'm "working-on" about 10
different features (changesets, bound branches, win32 fixes, a general
integration branch, etc). It always seems to happen that I could really
use X feature before I work on the next thing, but to get X done well
could use Y, etc. :)

John
=:->

> 
> Cheers,
> 
> Kevin
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051129/ddd63cdb/attachment.pgp