I am working on a Hg repo in BitBucket. I forked this repo from another main repo.
Here's my scenario:
> hg paths
default = ssh://hg#bitbucket.org/shuwnyuantee/jstock-android-as
yccheok = ssh://hg#bitbucket.org/yccheok/jstock-android-as
default repo is my forked repo. yccheok is the main repo I forked from.
I did the below so I am on drive-wealth branch of default repo.
> hg pull
pulling from ssh://hg#bitbucket.org/shuwnyuantee/jstock-android-as
> hg update drive-wealth
128 files updated, 0 files merged, 1 files removed, 0 files unresolved
> hg branch
drive-wealth
> hg log -l 3
changeset: 2770:a210525cc123
branch: drive-wealth
tag: tip
parent: 2769:a0bacd6f326a
parent: 2768:0eb8c0268784
user: Shuwn Yuan Tee <s.yuan31tee#gmail.com>
date: Tue Mar 21 16:41:04 2017 +0800
summary: merge default branch
changeset: 2769:a0bacd6f326a
branch: drive-wealth
parent: 2676:7571be00648f
user: Shuwn Yuan Tee <s.yuan31tee#gmail.com>
date: Tue Mar 21 13:17:14 2017 +0800
summary: list all accounts API
changeset: 2768:0eb8c0268784
user: Yan Cheng Cheok <yccheok#yahoo.com>
date: Sat Mar 18 13:56:51 2017 +0800
summary: Add the missing tracker name.
I wish to revert commit 2770:a210525cc123 on drive-wealth branch & push to default repo. I tried hg strip --keep -r . suggested here. Some files appear as Modified as:
> hg status
M achartengine/build.gradle
M androidXml/build.gradle
M androidlockpattern/build.gradle
M gradle/wrapper/gradle-wrapper.properties
M jstockandroid/build.gradle
M jstockandroid/src/main/AndroidManifest.xml
......
My questions are:
1) Those files show changes in Merge, but not all files are reverted correctly, many changes are missing / not undone. Any idea?
2) If (1) successfully undo all, then what are steps to proceed? What I want to achieve is => simply revert commit 2770:a210525cc123 on branch drive-wealth for default repo & push to default repo?
Thanks!
don't you need to also trip 2769?
as 2770 is your merge commit
so
hg strip --keep -r 2770
hg strip --keep -r 2769
then push
Related
---I have the same problem but the fix does not seem to work.
I cloned a new repository. From it, I
a. created a new branch with git checkout -b
b. We updated our files in one of the directories, call it GAWBE
c. did our push to that branch
d. inspected the branch on the github.com site, It was fine
Then, I had to update files in a different directory to the master branch.
Call the directory PDBE
Thus, I did
git checkout master
went to the PDBE directory
updated several files there
did the git status
(I got the message
On branch master
nothing to commit, working directory clean
as indicated above)
I did the git branch --set-upstream-to origin/master
Got the message
Branch master set up to track remote branch master from origin.
f. I then did git status
Again, I got
# On branch master
nothing to commit, working directory clean
I tried
git pull origin
From https://github.com/doctorleff/u3e
*branch master -> FETCH_HEAD
Already up to date.
h. I tried git status again with the same working directoyr clean message
and git commit with the same message
Needless to say, I alo checked my .gitignore and .git/info/exclude
Nothing in the latter--former does not specify any of the files in question,
all .java
This as per the Issue 37269222
Also tried the rm -rf .git (Issue 37900326)
also tried git log as per issue 29578546, got error message:
fatal: bad default revision 'HEAD'
Thank you for suggesting that I create a minimal file to show the problem
with my branches and git hub.
On github, I created a new repository. (It is marked public.)
(It is doctorleff/TR
1) I created a directory TR to serve as my repository.
2) I put a single file there IncomeFile.java
3) git init
Told me Initialized empty Git repository in /home/leffstudent/TR/.git
4) git add IncomeFile.java
5) Created gitignore with *.class
6) git add .gitignore
7) git status told me
# On branch master
#
# Initial commit
#
# Changes to be committed:
# (use "git rm --cached <file>..." to unstage)
#
# new file: .gitignore
# new file: IncomeFile.java
8) `git commit -m "first commit"
Response was:
[master (root-commit) 6e71c52] first commit
2 files changed, 37 insertions(+)
create mode 100644 .gitignore
create mode 100644 IncomeFile.java
8) git remote add origin https:/github.com/doctorleff/TR.git
9) git push -u origin master
It asked me for my git login and password, then told me
Counting ojbects: 4, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (3/3), done
Writing objects: 100% (4/4), 681 bytes | 0 bytes/s, done.
10) git checkout -b TOMCAT
Told me:
Switched to a new branch 'TOMCAT'
11) I changed IncomeFile.java slightly
12) git add IncomeFile.java
13) git commit -m "testing tomcat branch"
[TOMCAT 54f1b57] testing tomcat branch
1 file changed, 1 insertion(+), 1 deletion (-)
14) git push origin tomcat
Again, I was asked for my github username and passwrd.
Then it told me:
error: src refspect tomcat does not match any.
error: failed to push some refs to 'https://github.com/doctorleff/TR.git'
15) When I did a git status
$On branch TOMCAT
nothing to commit, working directory clean
Same thing if I simply type git status
I tried git check-ignore -v -- IncomeFile.java
Just get back the prompt
My test directory now seems to be working. Thus, I went back to the original cloned repository about which I spoke earlier.
I followed some of the instructions in
StackOverflow issue 4089430. (See link below)
I compared the results on both the working TEST repository and the
repository that does not work. It appears that the local repository
lost track of its remote.
I was thinking, should I do a git clone right into the defective
repositories to reconnect them to the world.
Meanwhile, I worked around my problem by cloning to a different computer,
a Macintosh. I am able to work normally with
the remote repository. Thus, I don't believe there is any problem with it.
And I have, a slightly less convenient, way to proceed with our project.
[How can I determine the URL that a local Git repository was originally cloned from?
I have two transcripts (edited slightly from script). The first is from
the test repository, that shows things working--
thanks for asking me to try that--
and then from the real one
cd TR
git remote show origin
* remote origin
Fetch URL: https://github.com/doctorleff/TR.git
Push URL: https://github.com/doctorleff/TR.git
HEAD branch: master
Remote branches:
TOMCAT tracked
master tracked
Local branch configured for 'git pull':
master merges with remote master
Local refs configured for 'git push':
TOMCAT pushes to TOMCAT (up to date)
master pushes to master (up to date)
git remote show origin
* remote origin
Fetch URL: https://github.com/doctorleff/TR.git
Push URL: https://github.com/doctorleff/TR.git
HEAD branch: master
Remote branches:
TOMCAT tracked
master tracked
Local branch configured for 'git pull':
master merges with remote master
Local refs configured for 'git push':
TOMCAT pushes to TOMCAT (up to date)
master pushes to master (up to date)
git status
# On branch master
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: IncomeFile.java
#
no changes added to commit (use "git add" and/or "git commit -a")
git checkout -- IncomeFile.java
git checkout TOMCAT
Switched to branch 'TOMCAT'
git status
# On branch TOMCAT
nothing to commit, working directory clean
VI IncomeFile.java
git commit -m "changed mC to Mc"
# On branch TOMCAT
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: IncomeFile.java
#
no changes added to commit (use "git add" and/or "git commit -a")
git add IncomeFile.java
git commit -m "changed mC to Mc"
[TOMCAT 7b842b0] changed mC to Mc
1 file changed, 1 insertion(+), 1 deletion(-)
push origin
fatal: The current branch TOMCAT has no upstream branch.
To push the current branch and set the remote as upstream, use
git push --set-upstream origin TOMCAT
git push --setu-upstream origin TOMCAT
Username for 'https://github.com': doctorleff
Password for 'https://doctorleff#github.com':
Counting objects: 5, done.
Delta compression using up to 2 threads.
Compressing objects: 33% (1/3)
Compressing objects: 66% (2/3)
Compressing objects: 100% (3/3)
Compressing objects: 100% (3/3), done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 323 bytes | 0 bytes/s, done.
Total 3 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 0% (0/1) remote: Resolving deltas: 100% (1/1) [K
remote: Resolving deltas: 100% (1/1), completed with 1 local object.[K
To https://github.com/doctorleff/TR.git
ff102ee..7b842b0 TOMCAT -> TOMCAT
Branch TOMCAT set up to track remote branch TOMCAT from origin.
git add IncomeFile.java
"change M[KCa to aC"
[TOMCAT 1a6739c] change Ca to aC
1 file changed, 1 insertion(+), 1 deletion(-)
git push origin
Username for 'https://github.com': doctorleff
Password for 'https://doctorleff#github.com':
Counting objects: 5, done.
Delta compression using up to 2 threads.
Compressing objects: 33% (1/3)
Compressing objects: 66% (2/3)
Compressing objects: 100% (3/3)
Compressing objects: 100% (3/3), done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 324 bytes | 0 bytes/s, done.
Total 3 (delta 1), reused 0 (delta 0)
remote: Resolving deltas: 0% (0/1) [K
remote: Resolving deltas: 100% (1/1) Resolving deltas: 100% (1/1), completed with 1 local object.[K
To https://github.com/doctorleff/TR.git
7b842b0..1a6739c TOMCAT -> TOMCAT
THUS, I then tried to go back to one of the repositories that was corrupted.
cd sv/web/src
git status
# On branch master
#
# Initial commit
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
#LONG LIST OF FILES REMOVED for clarity
#
# Test.java
nothing added to commit but untracked files present (use "git add" to track)
git add Test.java
git commit -m "testing with Test.java"
[master (root-commit) 96c329f] testing with Test.java
1 file changed, 70 insertions(+)
create mode 100644 Test.java origin
fatal: The current branch master has no upstream branch.
To push the current branch and set the remote as upstream, use
git push --set-upstream origin master
git push --set-upstream origin master
fatal: 'origin' does not appear to be a git repository
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists
____________________________________________
git status
# On branch master
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# $
# .RatingEntryServletNew.java.swp
# 11in35tr.xls
# AdminFrontServlet.class
# AdminFrontServlet.java
# AgreementBackend.class
-- REST OF LONG LIST OF FILES GIVEN DELETED FOR BREVITY
nothing added to commit but untracked files present (use "git add" to track)
git remote show origin
fatal: 'origin' does not appear to be a git repository
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
git config --get remote.origin.url
git remote -v
git ls-remote --get-r[Kurl
fatal: No remote configured to list refs from.
git ls-remote --get-url origin
origin
I also tried the git check-ignore -v -- on several files on the depository.
This was as suggested in the answer.
It just returns--I assume that means that these files are not affected by
any ignore rule.
____ response to VonC ___
In sv/web/src there is a .git subdirectory. FETCH_HEAD is zero bytes
HEAD syas refs: refs/heads/master That file exists and contains a long
hex code which I assume is a commit code, but I cannot find it at github.com.
The root (sv) also has a .git There, HEAD says refs/heads/tomcat
MY other local reposityory copy
sw/web/src also has a .git Its HEAD has
line ref: refs/heads/master But in that case, that file does not exist.
As suggested, I did try git remote -v on the two repositories in
question. Here is the output for sv
git remote -v
githubrepo https://github.com/doctorleff/u3e.git (fetch)
githubrepo https://github.com/doctorleff/u3e.git (push)
origin https://github.com/doctorleff/u3e.git (fetch)
origin https://github.com/doctorleff/u3e.git (push)
The second sw is showing that the repository is hopelessly corrupted:
git remote -v
fatal: Not a git repository (or any parent up to mount point /home)
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
Since then, I have created a new local clone on this repository from github.
I went back and forth between the two branches and everything is OK.
Thus, please consider this matter closed as not reproducable and no longer
a problem for original poster.
~
I also checked my .gitignore and .git/info/exclude Nothing in the latter--former does not specify any of the files in question, all .java
Double-check with:
git check-ignore -v -- PDBE/yourFile
Sometime, gitignore rules can come from other sources (like an IDE).
The first push of the tomcat branch should be git push -u origin tomcat
If a repo is inside another one, it becomes a nested repo: it might not have an origin, while its parent (which includes said nested repo) have:
Do a git remote -v in each folder.
You can add a remote origin (in the nested repo folder) with git remote add origin /url/remote/repo. Then the push might work better.
I have a file, version.txt and other files. I changed the other files, but didn't touch version.txt.
So, I've tried to push a commit, and saw a Remote heads error. (There is a changeset which modifies versions.txt file)
I did a hg pull, then hg update.
The error is: abort: crosses branches (merge branches or use --clean to discard changes)
Then I tried hg merge: abort: outstanding uncommitted changes (use 'hg status' to list changes)
But I don't undertand, why if the versions.txt isn't modified by me, why can't it just merge.
This is something I will be doing a lot, which is, develop and merge, to keep inline with the main dev repo. How can I fix this thing?
HG Status:
M printbox/web/printbox/controllers/ct_adm_colas.php
M printbox/web/printbox/controllers/ct_adm_jobs.php
M printbox/web/printbox/controllers/ct_form_configurar_cola.php
M printbox/web/printbox/core/MY_Controller.php
M printbox/web/printbox/css/estilos.css
M printbox/web/printbox/js/js_tablas_colas-jobs_ajax.js
M printbox/web/printbox/models/md_cola.php
M printbox/web/printbox/models/md_job.php
M printbox/web/printbox/views/vw_tabla_colas.php
M printbox/web/printbox/views/vw_tabla_jobs.php
A printbox/web/printbox/core/MY_Model.php
? .idea/.name
? .idea/encodings.xml
? .idea/misc.xml
? .idea/modules.xml
? .idea/printboxweb.iml
? .idea/scopes/scope_settings.xml
? .idea/vcs.xml
? .idea/workspace.xml
EIDT: Before and After following the suggested fix, the graph log looks like this:
o changeset: 19:e21fa7b131b0
| tag: tip
| parent: 17:54f59f253460
| user: JCV
| date: Tue Apr 22 12:33:36 2014 -0300
| summary: # Modificar nombre de producto para version
|
| # changeset: 18:a03eaad764cd
|/ user: Jorge S <js#fusiondev.com.ar>
| date: Wed Apr 23 16:28:01 2014 -0300
| summary: Eliminar método que no se utiliza.
|
o changeset: 17:54f59f253460
| user: Jorge S <js#fusiondev.com.ar>
| date: Mon Apr 21 17:25:23 2014 -0300
| summary: Incluir SWHelper en Printbox.php
|
# changeset: 21:1698791a9310
|\ tag: tip
| | parent: 20:3bfa1251da1b
| | parent: 19:e21fa7b131b0
| | user: Jorge S <js#fusiondev.c
| | date: Thu Apr 24 13:59:25 2014 -0300
| | summary: Merge
| |
| o changeset: 20:3bfa1251da1b
| | parent: 18:a03eaad764cd
| | user: Jorge S <js#fusiondev.c
| | date: Thu Apr 24 13:57:23 2014 -0300
| | summary: Commit de archivos
| |
o | changeset: 19:e21fa7b131b0
| | parent: 17:54f59f253460
| | user: JCV
| | date: Tue Apr 22 12:33:36 2014 -0300
| | summary: # Modificar nombre de producto
| |
| o changeset: 18:a03eaad764cd
|/ user: Jorge S <js#fusiondev.c
| date: Wed Apr 23 16:28:01 2014 -0300
| summary: Eliminar método que no se utili
|
o changeset: 17:54f59f253460
| user: Jorge S <js#fusiondev.com
| date: Mon Apr 21 17:25:23 2014 -0300
| summary: Incluir SWHelper en Printbox.php
Ok, forget about version.txt, it is not relevant here. You have 2 repos, one on your system, and the remote one.
When you tried to push the first time, you tried to send a changeset on the remote repo, and you got an error saying that you cannot push a second head, unless you issue a --force option. This is because someone else already beat you to it and pushed a changeset (modifying version.txt) on the same branch (what you call main line, is actually a branch too, and it is probably called default).
What you did next is good, you pulled the changes from the remote repo to solve the 2 heads problem. By doing so, you are the one ending up with 2 heads on the default. This is fine, it is easy to solve, we'll get to it soon.
Your current state must look like this
% hg log --graph
o changeset: 14:3cfac6413110
| tag: tip
| parent: 10:d573f47ecc2d
| summary: vb
|
| # changeset: 13:d8edfdb0532e
|/ parent: 10:d573f47ecc2d
| summary: commit to subr2
|
Now it gets complicated when you do the hg update because mercurial notices that something is wrong with your repo. You will need to fix the 2 heads issue by doing a merge, just like mercurial's suggestion.
However, doing hg merge gives you a second error, this time because you have not committed all your changes in your repo. Now you have 2 choices. You see those files with the M in front of them when you tried the hg status command? If you indeed modified them, and you want to include them in the repo, do the following:
hg commit -m "Committing remaining files"
hg merge
hg commit -m "Merge"
This is to commit the left-over changes, merge the 2 heads, then commit the merge changeset. The reason why mercurial does not want to update with uncommitted changes is for security reasons. It does not want you to loose you current work. And this brings me to the second option. If, however, the changes in the modified files are not wanted, you can discard those changes. It is possible you attempted something else during the confusion, which updated some files and left you in an in-between state. If that is the case, you can quickly discard the changes and solve the problem by doing these commands instead (loosing your changes):
hg update --clean
hg merge
hg commit -m "Merge"
The update will simply clean out the repo, and a merge will be possible. Once the merge committed, then you can issue the final push.
hg push
If you're lucky and no one pushed anything else on the remote repo, the push should succeed. Otherwise, you can pull, merge, commit and push again.
So somebody on our team moved an entire folder into a subdirectory without using hg's rename feature. The directory structure is like we need it, but the history is now gone prior to the move. It shows it as a new file when the move occurred. Numerous large merges have happened since then, and so it is not really practical to go back in time and do it right.
I have tried hg log --follow and it does not help, since hg does not know about the rename. Is there any way to manually link the files to the old removed versions after the fact, or is there some facility like the way git can infer moves and renames based on hueristics? It would be nice if there was some way to explicitly say, "this file is a continuation of this old deleted file.", even though that would still take some time to fix it all up right.
We have all but given up on ever getting that history back, but it would be really nice to have it.
You need to redo the move correctly by explicitly telling Mercurial what files were moved, then merge the broken changesets. This way you will restore the history path to the original files.
Steps, assuming <x> is the move revision, and <y> is the current head revision.
Update to the revision before the move: hg update <x-1>
Redo the move, but now correctly using hg rename or hg rename --after
Commit
Merge with the original move revision (hg merge <x>), this should have no conflicts but if there are discard all changes.
Commit
Merge with the remaining changesets after the move (if any) (hg merge <y>)
Commit
Here is the basic process shown on the command line:
$ mkdir move-merge-test
$ cd move-merge-test
$ hg init
$ echo "x" > a
$ hg add a
$ hg commit -m "initial revision"
Move incorrectly:
$ mv a b
$ hg remove a
$ hg add b
$ hg status --copies
A b
R a
$ hg commit -m "incorrect move"
$ hg log --follow b
changeset: 1:b22f3e94133b
tag: tip
user: Laurens Holst <...>
date: Wed Oct 19 14:41:37 2011 +0200
summary: incorrect move
Correct the move:
$ hg update 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg rename a b
$ hg status --copies
A b
a
R a
$ hg commit -m "correct move"
created new head
$ hg log --follow b
changeset: 2:5deabbcb5480
tag: tip
parent: 0:b82f89f0c7d9
user: Laurens Holst <...>
date: Wed Oct 19 14:46:35 2011 +0200
summary: correct move
changeset: 0:b82f89f0c7d9
user: Laurens Holst <...>
date: Wed Oct 19 14:36:35 2011 +0200
summary: initial revision
Merge it with the broken move:
$ hg merge 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg commit -m "merge with broken move"
$ hg log --follow b
changeset: 3:ce65fc7b35e4
tag: tip
parent: 2:5deabbcb5480
parent: 1:b22f3e94133b
user: Laurens Holst <...>
date: Wed Oct 19 14:47:13 2011 +0200
summary: merge broken branch
changeset: 2:5deabbcb5480
parent: 0:b82f89f0c7d9
user: Laurens Holst <...>
date: Wed Oct 19 14:46:35 2011 +0200
summary: correct move
changeset: 1:b22f3e94133b
user: Laurens Holst <...>
date: Wed Oct 19 14:41:37 2011 +0200
summary: incorrect move
changeset: 0:b82f89f0c7d9
user: Laurens Holst <...>
date: Wed Oct 19 14:36:35 2011 +0200
summary: initial revision
As you can see, the history now correctly shows all affected changesets. If the files are moved in several commits, the basic principle stays the same just merge across more than just 1 commit. If you have any commits made after the move, I recommend to merge them in separately (step 6 in the steps above) in order to avoid spurious conflicts.
I had good luck with this kind of thing by deleting the new (the "moved") file, then going back to a revision when the file was still in place, doing the move properly (including commit) and merging the two heads.
There's a --after option to hg rename which lets you tell Mercurial about a rename after the fact, but it has to be done before you commit the rename.
You could try doing hg convert on the repository and specify the --filemap parameter, which will let you rename a files and directories.
https://www.mercurial-scm.org/wiki/ConvertExtension#A--filemap
In git, I can use git log --stat to see which files changed in a commit. How can I do that in bzr?
$ git log --stat
commit dbdc98ccc1ce12a31a0bf29173b4990ccbff98
Author: Me <Me#Me.com>
Date: Thu Jan 29 19:03:10 2011 -0800
Add snipMate v0.83
vim/after/plugin/snipMate.vim | 35 ++
vim/autoload/snipMate.vim | 433 ++++++++++++++++++++++++++
vim/doc/snipMate.txt | 286 +++++++++++++++++
bzr viz doesn't show changed files either.
bzr log --verbose will list the files under a modified: header.
Also, bzr help and bzr help <command> are helpful.
I'm actually trying something simple, but I get strange results:
I want to compare the current version of a file with a specific revision.
In NetBeans 6.9.1 I didn't find any such function. I can only call the history and then diff between successive revisions. Am I missing something?
I tried with the command line tool (Linux):
hg diff --rev 527 pom.xml
But I get:
diff -r 1018d7890ea1 pom.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pom.xml Sun Jan 30 22:45:28 2011 +0000
## -0,0 +1,167 ##
+
followed only by "+" lines.
How can I get the diff I want? How can I get this diff with NetBeans (or otherwise with another graphical diff tool)?
You usage of the command-line tool looks correct. However the output
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
Indicates that the file you want to diff did not yet exist in the revision you chose.
Addendum:
In the comments you mention the file was renamed and you need to use -g
You can enable -g for all diffs by adding:
[diff]
git=1
to your .hgrc file (usually located in your home directory)
hg diff -r revision1:revision2 file
Where revision1 and revision2 can be a tag, changeset etc.
By default, your revision2 should be "tip" (without quotes) if you want to compare a revision to the current one.