Conflicts in removed files

[David Strauss]

On 2009-12-11 23:26, Algis Kabaila wrote:
> In view of the answers by Andrew, Alexander and David, would you write a short 
> brief how we (you and I) can make up a simple (articially made) example to 
> demonstrate the problem of apparently spurious "conflicts" at merge.  As I have 
> described in my previous email, I am very interested in this, as I 

I'm reluctant to accept this usage of "spurious conflict" because the
conflict in question is completely legitimate, just inconvenient to
certain workflows. The labeling is entirely subjective.

That said, you can reproduce the conflict this way:

bzr init brancha
cd brancha
touch a
bzr add
bzr commit -m"Add file 'a'."
cd ..
bzr branch brancha branchb
cd branchb
bzr rm a
bzr commit -m"Remove file 'a'."
cd ../brancha
echo "content" > a
bzr commit -m"Add 'content' to file 'a'."
cd ../branchb
bzr merge ../brancha

> 1. would like to avoid the problem you have.
> 2. I would like to see how it can be solved once and for all.
> 
> BTW, I accept Andrew's explanation of a reason for typical behaviour in 
> several vcs.  Bazaar has a del (or rm) command, just as svn has, too.  In both 
> of these major cvs tools, traces of deleted file would remain, but should not 
> cause persistent spurious conflicts.

-- 
David Strauss
   | david at fourkitchens.com
Four Kitchens
   | http://fourkitchens.com
   | +1 512 454 6659 [office]
   | +1 512 870 8453 [direct]

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