[Monotone-devel] Unresolved conflict, want to back out...

2006-10-26 Thread J Decker
I have several branches.branch A is the 'trunk'branch B is one evolution from the trunkbranch C is a descendnat of branch A with a specific 'pluck' of changes between A and B applied .branch D is another development path of A mtn propagate branch.c branch.a (update A to be the head of C with

[Monotone-devel] Unresolved conflict, want to back out...

2006-10-26 Thread J Decker
Here is a batch file which accomplishes the same thing I did.It creates a temp .db using mtn it generates a key called 'junk' which it sets up for itself.It starts by deleting the temp directory 'x' and the database ' temp.db' then starts fresh every time. Begin test.bat rmdir /s xdel

Re: [Monotone-devel] Unresolved conflict, want to back out...

2006-10-26 Thread Brian May
J == J Decker J writes: J mtn.EXE: [source] 6c5472831fe23406d9107638185f72d7eb96c9e0 J mtn.EXE: [target] 530d500ad40b790d2ea1b0986fe1372032434863 J mtn.EXE: warning: rename target conflict: nodes 2117, 2081, both want parent 1442, name dealer_editor J mtn.EXE: warning: resolve

Re: [Monotone-devel] Unresolved conflict, want to back out...

2006-10-26 Thread J Decker
Dealer_editor is a directory. It exists within the same location in both versions (or would) ... full path is something like src/apps/milk/dealer_editorOn 10/26/06, Brian May [EMAIL PROTECTED] wrote: J == J Decker J writes:J mtn.EXE: [source] 6c5472831fe23406d9107638185f72d7eb96c9e0J mtn.EXE: