##// END OF EJS Templates
ui.prompt: Show prompt and selection in non-interactive mode...
Mads Kiilerich -
r8940:01ada7b1 default
parent child Browse files
Show More
@@ -277,7 +277,7 b' class ui(object):'
277 insensitive. If ui is not interactive, the default is returned.
277 insensitive. If ui is not interactive, the default is returned.
278 """
278 """
279 if not self.interactive():
279 if not self.interactive():
280 self.note(msg, ' ', default, "\n")
280 self.write(msg, ' ', default, "\n")
281 return default
281 return default
282 while True:
282 while True:
283 try:
283 try:
@@ -4,6 +4,10 b' 2 files updated, 0 files merged, 0 files'
4 created new head
4 created new head
5
5
6 # non-interactive merge
6 # non-interactive merge
7 local changed file1 which remote deleted
8 use (c)hanged version or (d)elete? c
9 remote changed file2 which local deleted
10 use (c)hanged version or leave (d)eleted? c
7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
8 (branch merge, don't forget to commit)
12 (branch merge, don't forget to commit)
9 status:
13 status:
@@ -304,6 +304,8 b' true.priority=1'
304 true.executable=cat
304 true.executable=cat
305 # hg update -C 1
305 # hg update -C 1
306 # hg merge -r 2 --config ui.merge=internal:prompt
306 # hg merge -r 2 --config ui.merge=internal:prompt
307 no tool found to merge f
308 keep (l)ocal or take (o)ther? l
307 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
309 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
308 (branch merge, don't forget to commit)
310 (branch merge, don't forget to commit)
309 # cat f
311 # cat f
@@ -512,6 +514,8 b' space'
512 revision 2
514 revision 2
513 space
515 space
514 merging f
516 merging f
517 output file f appears unchanged
518 was merge successful (yn)? n
515 merging f failed!
519 merging f failed!
516 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
520 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
517 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
521 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
General Comments 0
You need to be logged in to leave comments. Login now