Show More
@@ -713,7 +713,8 b' def updatemq(repo, state, skipped, **opt' | |||
|
713 | 713 | for rev in sorted(mqrebase, reverse=True): |
|
714 | 714 | if rev not in skipped: |
|
715 | 715 | name, isgit = mqrebase[rev] |
|
716 |
repo.ui. |
|
|
716 | repo.ui.note(_('updating mq patch %s to %s:%s\n') % | |
|
717 | (name, state[rev], repo[state[rev]])) | |
|
717 | 718 | mq.qimport(repo, (), patchname=name, git=isgit, |
|
718 | 719 | rev=[str(state[rev])]) |
|
719 | 720 | else: |
@@ -49,11 +49,30 b' already has one local mq patch' | |||
|
49 | 49 | |
|
50 | 50 | $ hg up -q -C qtip |
|
51 | 51 | |
|
52 | $ hg rebase | |
|
52 | $ hg rebase -v | |
|
53 | 53 | rebasing 2:13a46ce44f60 "P0" (p0.patch qbase) |
|
54 | resolving manifests | |
|
55 | removing p0 | |
|
56 | getting r1 | |
|
57 | resolving manifests | |
|
58 | getting p0 | |
|
59 | p0 | |
|
54 | 60 | rebasing 3:148775c71080 "P1" (p1.patch qtip) |
|
61 | resolving manifests | |
|
55 | 62 | note: rebase of 3:148775c71080 created no changes to commit |
|
63 | rebase merging completed | |
|
64 | updating mq patch p0.patch to 5:9ecc820b1737 | |
|
65 | $TESTTMP/a/.hg/patches/p0.patch | |
|
66 | 2 changesets found | |
|
56 | 67 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-backup.hg (glob) |
|
68 | 2 changesets found | |
|
69 | adding branch | |
|
70 | adding changesets | |
|
71 | adding manifests | |
|
72 | adding file changes | |
|
73 | added 2 changesets with 2 changes to 2 files | |
|
74 | rebase completed | |
|
75 | 1 revisions have been skipped | |
|
57 | 76 | |
|
58 | 77 | $ hg tglog |
|
59 | 78 | @ 3: 'P0' tags: p0.patch qbase qtip tip |
General Comments 0
You need to be logged in to leave comments.
Login now