[EMAIL PROTECTED] work]$ hg pull -r master ../glob2-hg pulling from ../glob2-hg requesting all changes adding changesets adding manifests adding file changes added 2561 changesets with 10649 changes to 534 files (run 'hg update' to get a working copy) [EMAIL PROTECTED] work]$ hg update 413 files updated, 0 files merged, 0 files removed, 0 files unresolved
How do I tell if what I have in glob2-hg is different from work (work = master?)? Some command I can run? On 4/23/07, Kai Antweiler <[EMAIL PROTECTED]> wrote:
> Oh, I have no problems doing the password. See above for output of hg pull. > > > > Now I want to merge, but when I try: > > > > When you don't code, you don't need to merge. > > When you pull the <master> branch you just need to update. > > Otherwise you might need to do "hg revert --all -r master", > > but then "make" will recompile everything. > > [EMAIL PROTECTED] glob2-hg]$ hg revert --all -r master > [EMAIL PROTECTED] glob2-hg]$ hg pull -r master > pulling from https://hg.globulation2.org/glob2/ > http authorization required > realm: Enter your globulation 2 mercurial username > user: k776 > password: > abort: Other repository doesn't support revision lookup, so a rev cannot be > specified. > [EMAIL PROTECTED] glob2-hg]$ Weird. I can test this now. Maybe an incoming repository will help. # cd incoming # hg pull <remote> # cd ../work # hg pull -r master ../incoming > Well, it does for me. -C is the only thing I can do. Does "hg revert --all -r master" not work? Revert is very helpfull when update isn't good enough. -- Kai Antweiler _______________________________________________ glob2-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/glob2-devel
-- Kieran.P http://qlwiki.linuxsolutions.co.nz/
_______________________________________________ glob2-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/glob2-devel
