Mercurial > hg
annotate tests/test-mq-symlinks.out @ 9523:d932dc655881
Merge with -stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 03 Oct 2009 14:39:57 -0500 |
parents | 561ff8d9e4f0 |
children | a981ddb16b80 |
rev | line source |
---|---|
5157
f6c520fd70cf
mq: teach qpop about symlinks
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 a -> a not a symlink |
f6c520fd70cf
mq: teach qpop about symlinks
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 a -> b |
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
7627
diff
changeset
|
3 popping symlink.patch |
7627 | 4 now at: base.patch |
5157
f6c520fd70cf
mq: teach qpop about symlinks
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 applying symlink.patch |
7627 | 6 now at: symlink.patch |
5157
f6c520fd70cf
mq: teach qpop about symlinks
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 a -> b |
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
7627
diff
changeset
|
8 popping removesl.patch |
7627 | 9 now at: symlink.patch |
7517
49f34b43cf90
patch: handle git patches that remove symlinks (issue1438)
Brendan Cully <brendan@kublai.com>
parents:
5157
diff
changeset
|
10 applying removesl.patch |
7627 | 11 now at: removesl.patch |
7517
49f34b43cf90
patch: handle git patches that remove symlinks (issue1438)
Brendan Cully <brendan@kublai.com>
parents:
5157
diff
changeset
|
12 C b |