##// END OF EJS Templates
backout: report short hash in commit message
Matt Mackall -
r4718:934275cd default
parent child Browse files
Show More
@@ -199,7 +199,7 b' def backout(ui, repo, node=None, rev=Non'
199 commit_opts = opts.copy()
199 commit_opts = opts.copy()
200 commit_opts['addremove'] = False
200 commit_opts['addremove'] = False
201 if not commit_opts['message'] and not commit_opts['logfile']:
201 if not commit_opts['message'] and not commit_opts['logfile']:
202 commit_opts['message'] = _("Backed out changeset %s") % (hex(node))
202 commit_opts['message'] = _("Backed out changeset %s") % (short(node))
203 commit_opts['force_editor'] = True
203 commit_opts['force_editor'] = True
204 commit(ui, repo, **commit_opts)
204 commit(ui, repo, **commit_opts)
205 def nice(node):
205 def nice(node):
@@ -1,21 +1,21 b''
1 # basic operation
1 # basic operation
2 adding a
2 adding a
3 reverting a
3 reverting a
4 changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57
4 changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57
5 a
5 a
6 # file that was removed is recreated
6 # file that was removed is recreated
7 adding a
7 adding a
8 adding a
8 adding a
9 changeset 2:44cd84c7349a backs out changeset 1:76862dcce372
9 changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372
10 content
10 content
11 # backout of backout is as if nothing happened
11 # backout of backout is as if nothing happened
12 removing a
12 removing a
13 changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a
13 changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d
14 cat: a: No such file or directory
14 cat: a: No such file or directory
15 # backout with merge
15 # backout with merge
16 adding a
16 adding a
17 reverting a
17 reverting a
18 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23
18 changeset 3:3eb045e364a4 backs out changeset 1:314f55b1bf23
19 merging with changeset 2:b66ea5b77abb
19 merging with changeset 2:b66ea5b77abb
20 merging a
20 merging a
21 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
21 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -25,7 +25,7 b' line 1'
25 adding a
25 adding a
26 adding b
26 adding b
27 reverting a
27 reverting a
28 changeset 3:4cbb1e70196a backs out changeset 1:22bca4c721e5
28 changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5
29 the backout changeset is a new head - do not forget to merge
29 the backout changeset is a new head - do not forget to merge
30 (use "backout --merge" if you want to auto-merge)
30 (use "backout --merge" if you want to auto-merge)
31 adding a
31 adding a
@@ -43,8 +43,8 b' abort: cb9a9f314b8b is not a parent of b'
43 abort: cannot use --parent on non-merge changeset
43 abort: cannot use --parent on non-merge changeset
44 # backout with valid parent should be ok
44 # backout with valid parent should be ok
45 removing d
45 removing d
46 changeset 5:11fbd9be634c backs out changeset 4:b2f3bb92043e
46 changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e
47 rolling back last transaction
47 rolling back last transaction
48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
49 removing c
49 removing c
50 changeset 5:1a5f1a63bf2c backs out changeset 4:b2f3bb92043e
50 changeset 5:033590168430 backs out changeset 4:b2f3bb92043e
General Comments 0
You need to be logged in to leave comments. Login now