Posted
by Vincent
on Stack Overflow
See other posts from Stack Overflow
or by Vincent
Published on 2010-03-25T14:45:03Z
Indexed on
2010/03/25
14:53 UTC
Read the original article
Hit count: 266
Compare to standard push/pull, what is the advantages of using the rebase command in Mercurial?
© Stack Overflow or respective owner
as seen on Stack Overflow
- Search for 'Stack Overflow'
While trying to work with Mercurial on project located on TrueCrypt partition I always get en error as follows:
** unknown exception encountered, details follow
** report bug details to http://mercurial.selenic.com/bts/
** or [email protected]
** Mercurial Distributed SCM (version 1.5.2+20100502)
**…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
I've installed Mercurial per MT's knowledge base file here.
Working with it server side using ssh from my Mac works fine. I can initialize repositories and the like, but pulling from the server or pushing from my Mac produces an error I don't understand.
Here's what I get when call hg push from…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
We're migrating from Subversion to Mercurial. To facilitate the migration, we're creating an intermediate Mercurial repository that is a clone of our Subversion repository. All developers will be begin switching over to the Mercurial repository, and we'll periodically push changes from the intermediate…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
How can I modify the mercurial.ini file to include an environment variable such as %userprofile%.
Specific situation:
I am learning to use Mercurial. I have modified the [ui] section of Mercurial.ini (in my home path) to include:
ignore = c:\users\user\.hgignore
Where user is my username literal…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
I’m trying to convert an existing Windows CVS repository to Mercurial and getting the following response and error:
C:\Windows\system32>hg convert c:\users\jeff\webs\shelter-cvs\shelter
assuming destination shelter-hg
initializing destination shelter-hg repository
connecting to :local:c:\cvs
abort:…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
Hey guys,
In Git I can do this:
1. Start working on new feature:
$ git co -b newfeature-123 # (a local feature development branch)
do a few commits (M, N, O)
master A---B---C
\
newfeature-123 M---N---O
2. Pull new changes from upstream master:
$ git pull
(master updated with…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
I just tried to rebase a very old branch with a minor modification onto my master.
There was a problem with merging just one of the three files involved, so I did an unthinking --skip, thinking that it would just skip that file, but as it happened, it seems to have skipped all my changes, and rolled…
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
I have a local branch work, where I created two new files a.py, b.py and committed them.
Then, instead of doing "git rebase origin/master", I accidently typed "git rebase origin master", and now the commit I did is gone and the files are gone. Does anyone know how I can recover my files?
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
Could somebody please explain to me why people warn about commit conflicts occuring from a rebase operation?
I tried reading about this by searching google but had some trouble understanding. If it matters, I am using ClearCase revision control.
>>> More
as seen on Stack Overflow
- Search for 'Stack Overflow'
I know of some people who use git pull --rebase by default and others who insist never to use it. I believe I understand the difference between merging and rebasing, but I'm trying to put this in the context of git pull. Is it just about not wanting to see lots of merge commit messages? Or are…
>>> More
