Mercurial > cobalt-mk2 / file comparison
comparison: cobalt.py
cobalt.py
- changeset 38
- 71046c4430d1
- parent 37
- 3399d716b3ae
- child 39
- afd590258a93
equal
deleted
inserted
replaced
| 37:3399d716b3ae | 38:71046c4430d1 |
|---|---|
| 449 zanrepo.hg_command (*pull_args) | 449 zanrepo.hg_command (*pull_args) |
| 450 | 450 |
| 451 # Also pull these commits to the zandronum main repository | 451 # Also pull these commits to the zandronum main repository |
| 452 if usestable: | 452 if usestable: |
| 453 devrepo = hgapi.Repo ('zandronum') | 453 devrepo = hgapi.Repo ('zandronum') |
| 454 pull_args.insert (1, '../zandronum-stable') | |
| 454 devrepo.hg_command (*pull_args) | 455 devrepo.hg_command (*pull_args) |
| 455 #fi | 456 #fi |
| 456 except Exception as e: | 457 except Exception as e: |
| 457 chanlog ('Warning: unable to pull: %s' % `e`) | 458 chanlog ('Warning: unable to pull: %s' % `e`) |
| 458 #tried | 459 #tried |
