Conflicts in removed files

[David Strauss]

Here's a fun use case that depends on functionality somewhat related to
Stefan's request. This conflict is less clearly legitimate, yet
addressing it would probably require the same mechanism (dead-ending a
file ID) as handling Stefan's issue.

Curium:bzrmv straussd$ bzr init branch1
Created a standalone tree (format: 2a)

Curium:bzrmv straussd$ cd branch1/
Curium:branch1 straussd$ touch a
Curium:branch1 straussd$ touch b
Curium:branch1 straussd$ bzr add
adding a
adding b
Curium:branch1 straussd$ bzr commit -m"ab"
Committing to: /Users/straussd/Sandbox/bzrmv/branch1/

added a
added b
Committed revision 1.

Curium:branch1 straussd$ cd ../
Curium:bzrmv straussd$ bzr init branch2
Created a standalone tree (format: 2a)

Curium:bzrmv straussd$ cd branch2
Curium:branch2 straussd$ touch c
Curium:branch2 straussd$ bzr add
adding c
Curium:branch2 straussd$ bzr commit -m"c"
Committing to: /Users/straussd/Sandbox/bzrmv/branch2/

added c
Committed revision 1.

Curium:branch2 straussd$ bzr branch ../branch1/ branch3
Branched 1 revision(s).

Curium:branch2 straussd$ bzr join branch3
renamed file:///Users/straussd/Sandbox/bzrmv/branch2/branch3/.bzr to
.bzr.retired.0
Curium:branch2 straussd$ bzr commit -m "join 3"
Committing to: /Users/straussd/Sandbox/bzrmv/branch2/

added branch3
added branch3/a
added branch3/b
Committed revision 2.
Curium:branch2 straussd$ cd branch3/
Curium:branch3 straussd$ bzr mv a ../
branch3/a => a
Curium:branch3 straussd$ bzr commit -m"mv a"
Committing to: /Users/straussd/Sandbox/bzrmv/branch2/

renamed branch3/a => a
Committed revision 3.
Curium:branch3 straussd$ cd ../../branch1/
Curium:branch1 straussd$ echo "content" > a
Curium:branch1 straussd$ echo "content" > b
Curium:branch1 straussd$ bzr commit -m "ab+"
Committing to: /Users/straussd/Sandbox/bzrmv/branch1/

modified a
modified b
Committed revision 2.
Curium:branch1 straussd$ cd ../branch2/branch3/
Curium:branch3 straussd$ ls
b
Curium:branch3 straussd$ cd ..
Curium:branch2 straussd$ bzr split branch3/
Curium:branch2 straussd$ cd branch3/

Curium:branch3 straussd$ ls
b
Curium:branch3 straussd$ bzr stat
removed:
  a
  c
renamed:
  branch3/ => /
unknown:
  .bzr.retired.0/
Curium:branch3 straussd$ bzr commit -m "split"
Committing to: /Users/straussd/Sandbox/bzrmv/branch2/branch3/

renamed branch3 =>
deleted
deleted a
deleted c
Committed revision 4.
Curium:branch3 straussd$ bzr merge ../../branch1/
+N  a.OTHER

 M  b
Contents conflict in a
1 conflicts encountered.

Curium:branch3 straussd$


-- 
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/20091215/d5e1f937/attachment.pgp