Mercurial > hgsubversion
comparison wrappers.py @ 262:3b3627611468
Fix pushing after 141513b.
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Sun, 12 Apr 2009 12:25:20 -0500 |
| parents | 141513b5173b |
| children | d978192f0d63 |
comparison
equal
deleted
inserted
replaced
| 261:141513b5173b | 262:3b3627611468 |
|---|---|
| 139 except cmdutil.NoFilesException: | 139 except cmdutil.NoFilesException: |
| 140 ui.warn("Could not push revision %s because it had no changes in svn.\n" % | 140 ui.warn("Could not push revision %s because it had no changes in svn.\n" % |
| 141 old_ctx) | 141 old_ctx) |
| 142 return 1 | 142 return 1 |
| 143 # 3. Fetch revisions from svn | 143 # 3. Fetch revisions from svn |
| 144 r = pull(None, ui, repo, True, stupid=opts.get('svn_stupid', False), | 144 # TODO this probably should pass in the source explicitly |
| 145 r = pull(None, ui, repo, svn=True, stupid=opts.get('svn_stupid', False), | |
| 145 username=user, password=passwd) | 146 username=user, password=passwd) |
| 146 assert not r or r == 0 | 147 assert not r or r == 0 |
| 147 # 4. Find the new head of the target branch | 148 # 4. Find the new head of the target branch |
| 148 repo = hg.repository(ui, hge.path) | 149 repo = hg.repository(ui, hge.path) |
| 149 oldtipctx = repo[oldtip] | 150 oldtipctx = repo[oldtip] |
