[Bug 263611] Re: sync of uncommitted code between 2 computers
Jelmer Vernooij
263611 at bugs.launchpad.net
Wed Nov 30 18:32:16 UTC 2011
*** This bug is a duplicate of bug 306645 ***
https://bugs.launchpad.net/bugs/306645
** This bug has been marked a duplicate of bug 306645
merge --uncommitted should allow pulling from remote working trees
--
You received this bug notification because you are a member of Ubuntu
Foundations Bugs, which is subscribed to bzr in Ubuntu.
https://bugs.launchpad.net/bugs/263611
Title:
sync of uncommitted code between 2 computers
Status in Bazaar Version Control System:
Confirmed
Status in “bzr” package in Ubuntu:
Triaged
Bug description:
Binary package hint: bzr
It would be nice to improve usability of bzr between 2 computers or
more to synchronize uncommitted code. This has been discussed on IRC
when I first bring the topic there.
Use case:
1/ Max works from home (computer A) or from the office (computer B)
2/ Max is working on a project where the workflow is to commit to the central/shared branch (on computer C) only complete patches (the tree must always build)
3/ The patch Max is working on is taking several days so he cannot commit to C to pass code between A and B (because it's not complete). Fake commit/uncommits are also unacceptable because the branch is shared and it will force A or B to push in override mode which could easily lead to loss of data.
4/ shared filesystems between A and B are not an option, and transport has to be on ssh, preferably doable from the side only (the other side could be firewalled, NATed or simply use a dynamic IP)
It is possible to scp the whole tree from A to B, then diff the two working trees and patch B but it's laborious.
Another option would be to revert B and pass a bzr diff from A to B, but it could lead to loss of data on B if B had diverged (a merge would have prevented that).
A better proposal on IRC was to use merge --uncommitted but it doesn't currently work on bzr+ssh or sftp ("is not a local path").
a bzr sync would be nice to have, with its own remembered locations,
and with the same merge/conflicts mechanism as regular commits.
To manage notifications about this bug go to:
https://bugs.launchpad.net/bzr/+bug/263611/+subscriptions
More information about the foundations-bugs
mailing list