Show More
@@ -534,9 +534,9 b' def _checksinglesidecopies(' | |||||
534 | # thing in pathcopies(): pathcopies(x, y) can return a copy where the |
|
534 | # thing in pathcopies(): pathcopies(x, y) can return a copy where the | |
535 | # destination doesn't exist in y. |
|
535 | # destination doesn't exist in y. | |
536 | pass |
|
536 | pass | |
537 | elif m2[src] != mb[src]: |
|
537 | elif mb[src] != m2[src] and not _related(c2[src], base[src]): | |
538 | if not _related(c2[src], base[src]): |
|
|||
539 |
|
|
538 | return | |
|
539 | elif mb[src] != m2[src] or mb.flags(src) != m2.flags(src): | |||
540 | # modified on side 2 |
|
540 | # modified on side 2 | |
541 | for dst in dsts1: |
|
541 | for dst in dsts1: | |
542 | copy[dst] = src |
|
542 | copy[dst] = src |
@@ -111,29 +111,25 b' make "a" renamed on the other side' | |||||
111 | merge them (from the rename side) |
|
111 | merge them (from the rename side) | |
112 |
|
112 | |||
113 | $ hg merge 'desc("make a executable")' |
|
113 | $ hg merge 'desc("make a executable")' | |
114 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
114 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
115 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (true !) |
|
|||
116 | (branch merge, don't forget to commit) |
|
115 | (branch merge, don't forget to commit) | |
117 | $ hg st --copies |
|
116 | $ hg st --copies | |
118 | M z (false !) |
|
117 | M z | |
119 | a (false !) |
|
118 | a | |
120 | $ [ -x z ] || echo "executable bit lost" |
|
119 | $ [ -x z ] || echo "executable bit lost" | |
121 | executable bit lost (true !) |
|
|||
122 |
|
120 | |||
123 | merge them (from the chmod side) |
|
121 | merge them (from the chmod side) | |
124 |
|
122 | |||
125 | $ hg up -C 'desc("make a executable")' |
|
123 | $ hg up -C 'desc("make a executable")' | |
126 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
124 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
127 | $ hg merge 'desc("rename a to z")' |
|
125 | $ hg merge 'desc("rename a to z")' | |
128 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
126 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
129 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (true !) |
|
|||
130 | (branch merge, don't forget to commit) |
|
127 | (branch merge, don't forget to commit) | |
131 | $ hg st --copies |
|
128 | $ hg st --copies | |
132 | M z |
|
129 | M z | |
133 | a (false !) |
|
130 | a | |
134 | R a |
|
131 | R a | |
135 | $ [ -x z ] || echo "executable bit lost" |
|
132 | $ [ -x z ] || echo "executable bit lost" | |
136 | executable bit lost (true !) |
|
|||
137 |
|
133 | |||
138 |
|
134 | |||
139 | $ cd .. |
|
135 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now