It's difficult to tell what is being asked here. This question is ambiguous, vague, incomplete, overly broad, or rhetorical and cannot be reasonably answered in its current form. For help clarifying this question so that it can be reopened, visit the help center.
Closed 12 years ago.
I am trying to pull changes from the live server. when i give "hg pull" command, it keeps on blinking without pulling anything....
Here are the details:
os - server-fedora linux,client windows xp and the message shown was running
E:\putty\PLINK.EXE" -ssh -i "D:\putty-keys\foldername\rprivate.ppk" -C -agent myname#servername.domain.com "hg -R /mnt/www/serverfolder serve --stdio
I have updated the version to 1.7.2, no change.
You need to provide a lot more context:
hg version (on server and client)
Os (on server and client)
trace and debug if available (try a "hg --pull --verbose" for instance)
Such a behavior was once common with a Kiln server, where you could observe:
c:\Repo\Project>hg pull
_ <-- (blinks)
But it has been fixed since.
The was a long thread with hg 1.5.2 (your version) stalling on Hg pull, but not with the same symptom.
It is worth a try though to upgrade your client first (since you may not have the possibility to do so on the server), and see if the problem persists with a more recent Hg version (like 1.7.2).
Related
This question already has answers here:
How to resolve git error: "Updates were rejected because the tip of your current branch is behind"
(12 answers)
Closed 2 years ago.
As I'm a new user to git. Can someone please help me out and explain the error shown in the picture
picture
The branch that you are working on is too far ahead of the remote branch. You need to pull the remote branch, resolve and conflicts and then you'll be able to push.
Git can be confusing!
It means that there are already changes on the remote branch that are not part of the history of your branch... under this circumstances, git is asking you to bring over those changes into your branch.... that is normally done with pull... or with merge... or with rebase. You can see the situation by running git fetch origin and then run something like gitk --all, then you will notice that your branch went in one direction, the remote branch went in a different direction.
Closed. This question needs debugging details. It is not currently accepting answers.
Edit the question to include desired behavior, a specific problem or error, and the shortest code necessary to reproduce the problem. This will help others answer the question.
Closed 2 years ago.
Improve this question
I accidentally tried to upload a zip folder I made, essentially doubling the media I was trying to push and this happened. I've tried searching on commands how to fix this and can't seem to find one.
I've tried that YouTube video that says git push -A
I've tried git ' lfs track "*.ext" '
And a couple others I can't recall
Thanks!
You can undo your previous commit.
From the linked answer:
$ git commit -m "Something terribly misguided" # (1)
$ git reset HEAD~ # (2)
<< edit files as necessary >> # (3)
$ git add ... # (4)
$ git commit -c ORIG_HEAD # (5)
I'm having this problem when trying to push to a remote server. It is a Mercurial repository on Phabricator. Here are my output.
hg commit -m "udpate README"
hg push
pushing to ssh://company.server
searching for changes
remote: abort: stream ended unexpectedly (got 0 bytes, expected 4)
I'm using the latest version of Mercurial 3.5.2+20151001 on Mac OS 10.10.
I have this problem from yesterday. During that time, I could successfully committed two times, although I did nothing.
Why the output somewhat looks like this question, the problem here is different, because I have deleted the repository and cloned again many times without any problem. (my first attempt to solve the problem)
The system admin and the server is at another city, so he can't take a look at my machine. Any help would be greatly appreciated.
This looks like there may be a problem with the server and client disagreeing on the new bundle2 format for the wire protocol introduced in 3.5. I'd recommend trying to temporarily downgrade to 3.4.2 (e.g. with pip install mercurial==3.4.2) to see if it fixes this. See this discussion on Phabricator. If it doesn't work, hg push --debug --traceback can provide more information on what exactly went wrong.
This question is unlikely to help any future visitors; it is only relevant to a small geographic area, a specific moment in time, or an extraordinarily narrow situation that is not generally applicable to the worldwide audience of the internet. For help making this question more broadly applicable, visit the help center.
Closed 10 years ago.
I have a seemingly normal mercurial repo, but doing a local clone of it leaves out bunches of files…
bash-3.2$ hg verify
repository uses revlog format 1
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
486 files, 23 changesets, 568 total revisions
bash-3.2$ hg clone . /tmp/clone
updating to branch default
resolving manifests
getting .hgignore
getting data/Agricultural Marketing Service - Agricultural Marketing Service - Home.html
getting data/SAMPLE_BIZ_FARMERS_MARKETS.XLS
...
130 files updated, 0 files merged, 0 files removed, 0 files unresolved
bash-3.2$
[update: the problem was that the original repository was in branch foo; and the clone gets created with the default branch current, which confused me]
Please show hg summary in both the original and the clone. It's possible you're updated to different revisions in each repository. Cloning a repository brings across the changesets, but doesn't update to the same revision as the source.
Also please show hg status for a file that's in the original but not in the clone.
There might be deleted files-- those would be in the repository, but not in the working directory. If I'm not mistaken, "N files updated" refers to the working directory in Mercurial.
for some reason "hg ci --close-branch" is coming up as an command not found in my mercurial. how do I get around this to close the branch in a different way?
thanks!
Your mercurial is too old. Close branch was added in version 1.6 or 1.7. You should upgrade, which is quite easy on most any platform.
Failing that there's no way to close a branch, but you can make it inactive by merging it into another branch. Both closed and inactive non-final for a named branch -- they never really go away.