Show More
@@ -706,6 +706,10 b' def pullrebase(orig, ui, repo, *args, **' | |||
|
706 | 706 | commands.postincoming = origpostincoming |
|
707 | 707 | revspostpull = len(repo) |
|
708 | 708 | if revspostpull > revsprepull: |
|
709 | # --rev option from pull conflict with rebase own --rev | |
|
710 | # dropping it | |
|
711 | if 'rev' in opts: | |
|
712 | del opts['rev'] | |
|
709 | 713 | rebase(ui, repo, **opts) |
|
710 | 714 | branch = repo[None].branch() |
|
711 | 715 | dest = repo[branch].rev() |
@@ -114,3 +114,55 b" pull --rebase doesn't update if nothing " | |||
|
114 | 114 | | |
|
115 | 115 | |
|
116 | 116 | $ cd .. |
|
117 | ||
|
118 | pull --rebase works when a specific revision is pulled (issue3619) | |
|
119 | ||
|
120 | $ cd a | |
|
121 | $ hg tglog | |
|
122 | @ 2: 'R1' | |
|
123 | | | |
|
124 | o 1: 'C2' | |
|
125 | | | |
|
126 | o 0: 'C1' | |
|
127 | ||
|
128 | $ echo R2 > R2 | |
|
129 | $ hg ci -Am R2 | |
|
130 | adding R2 | |
|
131 | $ echo R3 > R3 | |
|
132 | $ hg ci -Am R3 | |
|
133 | adding R3 | |
|
134 | $ cd ../c | |
|
135 | $ hg tglog | |
|
136 | o 2: 'R1' | |
|
137 | | | |
|
138 | @ 1: 'C2' | |
|
139 | | | |
|
140 | o 0: 'C1' | |
|
141 | ||
|
142 | $ echo L1 > L1 | |
|
143 | $ hg ci -Am L1 | |
|
144 | adding L1 | |
|
145 | created new head | |
|
146 | $ hg pull --rev tip --rebase | |
|
147 | pulling from $TESTTMP/a | |
|
148 | searching for changes | |
|
149 | adding changesets | |
|
150 | adding manifests | |
|
151 | adding file changes | |
|
152 | added 2 changesets with 2 changes to 2 files | |
|
153 | saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-backup.hg (glob) | |
|
154 | $ hg tglog | |
|
155 | @ 5: 'L1' | |
|
156 | | | |
|
157 | o 4: 'R3' | |
|
158 | | | |
|
159 | o 3: 'R2' | |
|
160 | | | |
|
161 | o 2: 'R1' | |
|
162 | | | |
|
163 | o 1: 'C2' | |
|
164 | | | |
|
165 | o 0: 'C1' | |
|
166 | ||
|
167 | ||
|
168 |
General Comments 0
You need to be logged in to leave comments.
Login now