![]() When Alice push, her two changesets ( 7d780c6154fb andġ2445668eefc) will automatically be rebased on top of the revision The new revision causes a fork in the history: pulled 1 revisions (run 'hg update' to get a working copy) alice$ hg pull pulling from alice: List email address for bug reports. Meanwhile, the Subversion repository has been changed: alice$ hg incoming incoming changes from revision: 12 user: alice date: T21:26:30.0Z message: List email address for bug reports. You do so, you will have to manually strip the old versions ofĬhangesets that are pushed to Subversion.Īlice makes a couple of more local changes in her Mercurial clone: alice$ hg outgoing comparing with changeset: 10:9a6e43d86b16 user: Alice date: Fri Mar 12 21:26:00 2010 +0000 summary: Express greater joy! changeset: 11:f3bd093438f1 tag: tip user: Alice date: Fri Mar 12 21:27:00 2010 +0000 summary: Added simple MIT license header. Should not make further Mercurial clones of your original clone. Notice how the author and timestamp changed because the Subversion You can see the updated changeset like this: alice$ hg tip changeset: 9:a545b3d1c21d tag: tip user: date: Fri Mar 12 21:25:00 2010 +0000 summary: Added footer. ![]() ![]() pulled 1 revisions saved backup bundle to $HOME/hello-hg/.hg/strip-backup/2dc661f0cdc8-backup.hg alice$ hg push pushing to searching for changes alice: Added footer. Rewritten to reflect the updated meta data: alice$ hg outgoing comparing with changeset: 9:2dc661f0cdc8 tag: tip user: Alice date: Fri Mar 12 21:20:15 2010 +0000 summary: Added footer. Subversion server, it will determine the username and timestamp that This isīecause the Subversion server is the master and when you commit to a Pushing the changeset involves rewriting it. The change is not yet on the Subversion server - like normal, hg Alice can now edit the files and commit them with Mercurial: alice$ echo "/* The End.
0 Comments
Leave a Reply. |