equal
deleted
inserted
replaced
159 try: |
159 try: |
160 lock = repo.lock() |
160 lock = repo.lock() |
161 tr = repo.transaction('transplant') |
161 tr = repo.transaction('transplant') |
162 for rev in revs: |
162 for rev in revs: |
163 node = revmap[rev] |
163 node = revmap[rev] |
164 revstr = '%s:%s' % (rev, nodemod.short(node)) |
164 revstr = '%d:%s' % (rev, nodemod.short(node)) |
165 |
165 |
166 if self.applied(repo, node, p1): |
166 if self.applied(repo, node, p1): |
167 self.ui.warn(_('skipping already applied revision %s\n') % |
167 self.ui.warn(_('skipping already applied revision %s\n') % |
168 revstr) |
168 revstr) |
169 continue |
169 continue |
193 exchange.pull(repo, source.peer(), heads=[node]) |
193 exchange.pull(repo, source.peer(), heads=[node]) |
194 |
194 |
195 skipmerge = False |
195 skipmerge = False |
196 if parents[1] != revlog.nullid: |
196 if parents[1] != revlog.nullid: |
197 if not opts.get('parent'): |
197 if not opts.get('parent'): |
198 self.ui.note(_('skipping merge changeset %s:%s\n') |
198 self.ui.note(_('skipping merge changeset %d:%s\n') |
199 % (rev, nodemod.short(node))) |
199 % (rev, nodemod.short(node))) |
200 skipmerge = True |
200 skipmerge = True |
201 else: |
201 else: |
202 parent = source.lookup(opts['parent']) |
202 parent = source.lookup(opts['parent']) |
203 if parent not in parents: |
203 if parent not in parents: |