I'm pretty newbish at this...
Thanks in advance :)
Your current problem is that the two repositories don't share a history and mercurial doesn't know that the different versions of a file are actually the same file.
If I was in your situation, here's what I'd do (and I'd back up any current work first!):
init
, add
, and commit
the remote repository clone
that remote repository locally diff
to make sure that the changes you copied onto the repo are what you expected. commit
those changes as your first changeset push
those changes to the remote repository . Then you're all set to commit
(N times), pull
, merge
, push
, and repeat.
Alternatively, if all you need is to know what has changed, I'd recommend just diff-ing the two folders using a utility like kdiff3 or Beyond Compare 3.
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.