lp://staging/bzr-merge-into

Created by Bazaar Developers and last modified
Get this branch:
bzr branch lp://staging/bzr-merge-into
Members of Bazaar Developers can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Bazaar Developers
Project:
Merge-Into Plugin
Status:
Development

Recent revisions

10. By John A Meinel

Add the GPLv2 copyright in COPYING.txt

9. By John A Meinel

Merge Alexander's small help fix.

7. By John A Meinel

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

6. By John A Meinel

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

set base revision to avoid other lookups

4. By John A Meinel

return an error code if there are conflicts.

3. By John A Meinel

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

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

1. By John A Meinel

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.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.