Need a bit of advice about unsynced remote changes

Michael Smith smithm at netapps.com.au
Sun Sep 18 07:41:53 CDT 2005


I have two repo's. For the sake of argument:

W (workstation)
S (server)

I normally work on a particular project on W and use hg to move changes
between the two repos.

I made a local change on S which is specific to that machine and
comitted it to the local repo.

The next time I pushed a change from W to S I got:

[smithm at W cgi-bin]$ hg push collodetti
pushing to ssh://collodetti@S/~/collodetti.com
searching for changes
found new changesets starting at 619a0eb58a50
abort: unsynced remote changes!
(did you forget to sync? use push -f to force)

Apparently it doesn't want to push to the S repo if there is a change
which could come back to W. I have a genuine need to keep a local change
on S. What is the cleanest way to do this?

Thanks in advance.
-- 
Michael Smith
Network Applications
www.netapps.com.au   | +61 (0) 416 062 898
Web Hosting          | Internet Services


More information about the Mercurial mailing list