Bazaar

Merge lp://staging/~mbp/bzr/32669-2.0-symlink-branch into lp://staging/bzr/2.0

  1. 32669-2.0-symlink-branch
  2. Merge into 2.0
Proposed by Martin Pool
Status: Work in progress
Proposed branch: lp://staging/~mbp/bzr/32669-2.0-symlink-branch
Merge into: lp://staging/bzr/2.0
Prerequisite: lp://staging/~mbp/bzr/2.0-stat-symlink
Diff against target: 209 lines (+101/-21)
4 files modified
NEWS (+7/-0)
bzrlib/bzrdir.py (+39/-16)
bzrlib/tests/blackbox/test_add.py (+26/-4)
bzrlib/tests/test_bzrdir.py (+29/-1)
To merge this branch: bzr merge lp://staging/~mbp/bzr/32669-2.0-symlink-branch
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+30241@code.staging.launchpad.net

Description of the change

This fixes 'bzr add SYMLINK_TO_BRANCH' (bug 32669) to add the symlink, rather than running add in the referent branch. The basic fix is that when you say "open_containing_from_transport", we shouldn't follow a symlink in the last part.

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

I'm not sure this is passing tests yet so not asking for review.

Reply
Revision history for this message
Vincent Ladeuil (vila) wrote :

@Martin: ping.
I just cut 2.0.6, is this abandoned ?

Reply

Unmerged revisions

4758. By Martin Pool

open_containing opens the directory containing symlinks, not the target

4757. By Martin Pool

Remove typo from test

4756. By Martin Pool

Merge transport symlink support

4755. By Martin Pool

Add test for bug 32669

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches