Show More
@@ -421,7 +421,9 b' class ui(object):' | |||||
421 |
|
421 | |||
422 | If not interactive -- the default is returned |
|
422 | If not interactive -- the default is returned | |
423 | """ |
|
423 | """ | |
424 |
if not self.interactive: |
|
424 | if not self.interactive: | |
|
425 | self.note(msg, ' ', default, "\n") | |||
|
426 | return default | |||
425 | while True: |
|
427 | while True: | |
426 | try: |
|
428 | try: | |
427 | r = self._readline(msg + ' ') |
|
429 | r = self._readline(msg + ' ') |
@@ -5,6 +5,8 b' resolving manifests' | |||||
5 | overwrite None partial False |
|
5 | overwrite None partial False | |
6 | ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c |
|
6 | ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c | |
7 | searching for copies back to rev 1 |
|
7 | searching for copies back to rev 1 | |
|
8 | conflicting flags for a | |||
|
9 | (n)one, e(x)ec or sym(l)ink? n | |||
8 | a: update permissions -> e |
|
10 | a: update permissions -> e | |
9 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
10 | (branch merge, don't forget to commit) |
|
12 | (branch merge, don't forget to commit) | |
@@ -15,6 +17,8 b' resolving manifests' | |||||
15 | overwrite None partial False |
|
17 | overwrite None partial False | |
16 | ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f |
|
18 | ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f | |
17 | searching for copies back to rev 1 |
|
19 | searching for copies back to rev 1 | |
|
20 | conflicting flags for a | |||
|
21 | (n)one, e(x)ec or sym(l)ink? n | |||
18 | a: remote is newer -> g |
|
22 | a: remote is newer -> g | |
19 | getting a |
|
23 | getting a | |
20 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
24 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -455,6 +455,8 b' resolving manifests' | |||||
455 | searching for copies back to rev 1 |
|
455 | searching for copies back to rev 1 | |
456 | b: versions differ -> m |
|
456 | b: versions differ -> m | |
457 | rev: versions differ -> m |
|
457 | rev: versions differ -> m | |
|
458 | remote changed a which local deleted | |||
|
459 | use (c)hanged version or leave (d)eleted? c | |||
458 | a: prompt recreating -> g |
|
460 | a: prompt recreating -> g | |
459 | preserving b for resolve of b |
|
461 | preserving b for resolve of b | |
460 | preserving rev for resolve of rev |
|
462 | preserving rev for resolve of rev | |
@@ -480,6 +482,8 b' resolving manifests' | |||||
480 | overwrite None partial False |
|
482 | overwrite None partial False | |
481 | ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b |
|
483 | ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b | |
482 | searching for copies back to rev 1 |
|
484 | searching for copies back to rev 1 | |
|
485 | local changed a which remote deleted | |||
|
486 | use (c)hanged version or (d)elete? c | |||
483 | b: versions differ -> m |
|
487 | b: versions differ -> m | |
484 | rev: versions differ -> m |
|
488 | rev: versions differ -> m | |
485 | preserving b for resolve of b |
|
489 | preserving b for resolve of b |
General Comments 0
You need to be logged in to leave comments.
Login now