0

In SVN and Perforce, regardless of what I have edited at any time or the changelists I have open, I can run "svn update" or "p4 sync" and my local filesystem is updated to latest, and unless there's an actual file-level conflict, everything is hunky-dory.

What is the simplest way in Mercurial to do this? "hg fetch" has been suggested, but that refuses to operate if you have multiple changelists committed locally.

flag

1 Answer

1

Does this work?

hg update -u

link|flag
That doesn't leave everything in a hunky-dory state - there's still an extra step of merging, which I'm trying to avoid, since 99% of our checkins don't have conflicts. – President Camacho Jun 18 2010 at 18:24
1 
 It sounds like you are editing the same files in your local repo that have been modified in your central/parent repo. Otherwise you shouldn't need to merge. Does this sound like what's happening? – Byron Ross Jun 19 2010 at 7:11

Your Answer

Not the answer you're looking for? Browse other questions tagged or ask your own question.