Show More
@@ -3032,7 +3032,7 b' def strip(ui, repo, *revs, **opts):' | |||||
3032 | del q.applied[start:end] |
|
3032 | del q.applied[start:end] | |
3033 | q.savedirty() |
|
3033 | q.savedirty() | |
3034 |
|
3034 | |||
3035 |
revs = |
|
3035 | revs = sorted(rootnodes) | |
3036 | if update and opts.get('keep'): |
|
3036 | if update and opts.get('keep'): | |
3037 | wlock = repo.wlock() |
|
3037 | wlock = repo.wlock() | |
3038 | try: |
|
3038 | try: |
@@ -309,16 +309,16 b' 2 is parent of 3, only one strip should ' | |||||
309 | 2 different branches: 2 strips |
|
309 | 2 different branches: 2 strips | |
310 |
|
310 | |||
311 | $ hg strip 2 4 |
|
311 | $ hg strip 2 4 | |
312 |
|
|
312 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
313 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
313 | saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) | |
314 | $ hg glog |
|
314 | $ hg glog | |
315 |
|
|
315 | o changeset: 2:65bd5f99a4a3 | |
316 | | tag: tip |
|
316 | | tag: tip | |
317 | | user: test |
|
317 | | user: test | |
318 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
318 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
319 | | summary: d |
|
319 | | summary: d | |
320 | | |
|
320 | | | |
321 |
|
|
321 | @ changeset: 1:ef3a871183d7 | |
322 | | user: test |
|
322 | | user: test | |
323 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
323 | | date: Thu Jan 01 00:00:00 1970 +0000 | |
324 | | summary: b |
|
324 | | summary: b |
General Comments 0
You need to be logged in to leave comments.
Login now