Bazaar

Merge lp://staging/~mbp/bzr/192859-2.0-symlinks-add into lp://staging/bzr/2.0

  1. 192859-2.0-symlinks-add
  2. Merge into 2.0
Proposed by Martin Pool
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: 4755
Proposed branch: lp://staging/~mbp/bzr/192859-2.0-symlinks-add
Merge into: lp://staging/bzr/2.0
Prerequisite: lp://staging/~mbp/bzr/192859-2.0-symlinks
Diff against target: 59 lines (+28/-0)
3 files modified
NEWS (+5/-0)
bzrlib/mutabletree.py (+4/-0)
bzrlib/tests/per_workingtree/test_symlinks.py (+19/-0)
To merge this branch: bzr merge lp://staging/~mbp/bzr/192859-2.0-symlinks-add
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+30183@code.staging.launchpad.net

Commit message

``bzr add SYMLINK/FILE`` now works properly when the symlink points to a previously-unversioned directory within the tree: the directory is marked versioned too.

Description of the change

This fixes the symlink handling problem of <https://bugs.edge.launchpad.net/bzr/+bug/192859/comments/3> - the test is pretty self-explanatory.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

sent to pqm by email

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