Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>Here are three ways to do this. I'll discuss the pros and cons of each:</p> <p><strong>Option 1</strong>: use <code>hg diff</code> to get a diff file showing the uncommited changes, and then <code>hg import --nocommit</code> on the receiving end to apply those changes without creating a new changeset</p> <ul> <li><strong>Pros</strong>: simple, creates no changesets</li> <li><strong>Cons</strong>: doesn't actually use mercurial ike the DVCS it is. Might not catch newly added files</li> </ul> <p><strong>Option 2</strong>: Commit on the sending side, push to the receiving end (or pull from it, or put a <code>hg bundle</code> on a flash drive), bypassing the work server, <code>update</code> on the receiving side, and then <code>hg rollback</code> on <strong>both</strong> sides to eliminate the changeset (but leave the changes.</p> <ul> <li><strong>Pros</strong>: Using push and pull to move over changes like mercurial intends</li> <li><strong>Cons</strong>: Hacky. Relies on rollback which only works 1-level deep. Accidentally pull twice and you can't undo the first.</li> </ul> <p><strong>Option 3</strong>: Commit on the sending side. Push to a developer-repo that only you access, and Pull on the receiving end. Don't push to the company repo until things build, but when you do push push all the interstitial changesets</p> <ul> <li><strong>Pros</strong>: Exactly what a DVCS is about. Your order of work is documented and preserved</li> <li><strong>Cons</strong>: requires setting up a you-only clone</li> </ul> <p>FWIW, I recommend option 3. Per-developer repositories are exactly what DVCSs are about. If your company doesn't make it easy to set one up on a server you can access from home and away, point out to them the immense value in having documented the process that got a developer to a completed fix/feature <strong>and</strong> that encouraging developers to push to a not-required-to-compile repo frequently is good for daily backups.</p> <p>Lastly, after you're done with your feature or fix you can always collapse-away all the intermediary changesets. I don't like do it (I'm a <em>show your work</em> kind of guy), but here's how: <a href="https://stackoverflow.com/questions/1725607/can-i-squash-commits-in-mercurial/1725638#1725638">Can I squash commits in Mercurial?</a></p>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload