| changeset 10413 | e433002acb05 |
| parent 10405 | 2d30d66a89ad |
| child 10445 | 8b45102934e2 |
| 10412:5326800d6937 | 10413:e433002acb05 |
|---|---|
1833 d = opts["base"] |
1833 d = opts["base"] |
1834 strip = opts["strip"] |
1834 strip = opts["strip"] |
1835 wlock = lock = None |
1835 wlock = lock = None |
1836 |
1836 |
1837 def tryone(ui, hunk): |
1837 def tryone(ui, hunk): |
1838 tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, hunk) |
1838 tmpname, message, user, date, branch, nodeid, p1, p2 = \ |
1839 patch.extract(ui, hunk) |
|
1839 |
1840 |
1840 if not tmpname: |
1841 if not tmpname: |
1841 return None |
1842 return None |
1842 commitid = _('to working directory') |
1843 commitid = _('to working directory') |
1843 |
1844 |