lp:~bialix/bzr-merge-into/help-tweak

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-merge-into

John A Meinel: Approve on 2009-09-04

Diff: None lines api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9. By Alexander Belchenko on 2009-04-10

minor fix in help

8. By John A Meinel on 2008-08-28

Merge in the changes from Scott Scriven

7. By John A Meinel on 2008-08-21

Handle non-normalized paths being passed in by the user.

6. By John A Meinel on 2008-07-21

Restore functionality for bzr.dev.

The core change was to get rid of 'set_interesting_files([])',
because now None means do everything, and [] means do nothing
(it used to mean do everything).

There are some other small changes to work with newer apis.
Also, lock all the trees before doing any work, which allows
this to work on Windows. It seems the lock ordering of the
merge code breaks on windows if the objects aren't already locked.

5. By John A Meinel on 2007-10-23

set base revision to avoid other lookups

4. By John A Meinel on 2007-02-02

return an error code if there are conflicts.

3. By John A Meinel on 2007-02-02

Always generate a new id for the root directory.
The problem is Knit1 doesn't create a knit for tree_root,
so commit fails if it is moved.

2. By John A Meinel on 2007-02-01

Make sure we can merge into a subdirectory, not just a direct subdir of root

1. By John A Meinel on 2007-02-01

New plugin which can merge projects into subdirs.
This provides a new command:
  bzr merge-into ../other/branch subdir
Which lets you merge another project into a new subdirectory of the
current one.