Bazaar

Merge lp://staging/~vila/bzr/660935-invalid-entry-name into lp://staging/bzr/2.2

Proposed by Vincent Ladeuil on 2011-01-14

Status:

Merged

Approved by:

John A Meinel on 2011-01-14

Approved revision:

no longer in the source branch.

Merged at revision:

5118

Proposed branch:

Merge into:

Diff against target:

3 files modified

NEWS (+3/-0)
bzrlib/conflicts.py (+3/-3)
bzrlib/tests/test_conflicts.py (+89/-1)

To merge this branch:

bzr merge lp://staging/~vila/bzr/660935-invalid-entry-name

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
John A Meinel			Approve on 2011-01-14
Vincent Ladeuil			Approve on 2011-01-14
Review via email: mp+46348@code.staging.launchpad.net

Correctly resolve --take-this/--take-other for path/content conflicts in subdirs.

Trivial fix for resolving conflicts in subdirs.

The shell-script test will go away when I merged in 2.3 and trunk but I thought it clearly explain the bug and may help during the SRU process.

Revision history for this message

Vincent Ladeuil (vila) wrote on 2011-01-14:

Vocally approved by jam :)

review: Approve

Revision history for this message

Vincent Ladeuil (vila) wrote on 2011-01-14:

sent to pqm by email

Revision history for this message

John A Meinel (jameinel) wrote on 2011-01-14:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 1/14/2011 3:43 PM, Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr/660935-invalid-entry-name into lp:bzr/2.2.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #660935 bzrlib.errors.InvalidEntryName when resolving path conflict
> https://bugs.launchpad.net/bugs/660935
>
> For more details, see:
> https://code.launchpad.net/~vila/bzr/660935-invalid-entry-name/+merge/46348
>
> Trivial fix for resolving conflicts in subdirs.
>
> The shell-script test will go away when I merged in 2.3 and trunk but I thought it clearly explain the bug and may help during the SRU process.
merge: approve