Show More
@@ -1573,8 +1573,9 b' class localrepository(object):' | |||||
1573 | self.ui.debug(_(" remote %s is newer, get\n") % f) |
|
1573 | self.ui.debug(_(" remote %s is newer, get\n") % f) | |
1574 | get[f] = m2[f] |
|
1574 | get[f] = m2[f] | |
1575 | s = 1 |
|
1575 | s = 1 | |
1576 | elif f in umap: |
|
1576 | elif f in umap or f in added: | |
1577 | # this unknown file is the same as the checkout |
|
1577 | # this unknown file is the same as the checkout | |
|
1578 | # we need to reset the dirstate if the file was added | |||
1578 | get[f] = m2[f] |
|
1579 | get[f] = m2[f] | |
1579 |
|
1580 | |||
1580 | if not s and mfw[f] != mf2[f]: |
|
1581 | if not s and mfw[f] != mf2[f]: |
@@ -55,3 +55,15 b' hg --debug up -f -m' | |||||
55 | hg parents |
|
55 | hg parents | |
56 | hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
|
56 | hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
57 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
|
57 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
|
58 | ||||
|
59 | # test a local add | |||
|
60 | cd .. | |||
|
61 | hg init a | |||
|
62 | hg init b | |||
|
63 | echo a > a/a | |||
|
64 | echo a > b/a | |||
|
65 | hg --cwd a commit -A -m a | |||
|
66 | cd b | |||
|
67 | hg add a | |||
|
68 | hg pull -u ../a | |||
|
69 | hg st |
@@ -136,3 +136,10 b' diff -r 802f095af299 a' | |||||
136 | @@ -1,1 +1,1 @@ a2 |
|
136 | @@ -1,1 +1,1 @@ a2 | |
137 | -a2 |
|
137 | -a2 | |
138 | +abc |
|
138 | +abc | |
|
139 | adding a | |||
|
140 | pulling from ../a | |||
|
141 | requesting all changes | |||
|
142 | adding changesets | |||
|
143 | adding manifests | |||
|
144 | adding file changes | |||
|
145 | added 1 changesets with 1 changes to 1 files |
General Comments 0
You need to be logged in to leave comments.
Login now