[git-users] Problems migrating from Perforce to Git

[EricP]

Hi,

My current workplace is using Perforce as its VCS. I and a few other guys 
would like to run a road test with using Git in our workflow instead. I 
already converted some SVN repositories into Git in my previous workplace 
and it went smoothly and my colleagues were, as far as I can tell, happy 
with the switch to Git.

In order to start our trial with the Git tools and workflow, we need to 
migrate the Perforce repository, or at least a few branches, to a Git repo. 
So I've started trying the git-p4 tool (running msysGit 1.7.11 on Windows 7 
x64, python 2.7.2) but I get this error:

"fatal: git was built without support for  (NO_PYTHON=YesPlease)"

The git-p4 tool is actually a Python script.

Has anybody ever ran into similar problem? Either with git-p4 or any other 
tool / extension?

I'm now considering having a virtual machine running some Linux distro to 
be used as a conversion sandbox.

Any hint would be appreciated.


Eric

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

[git-users] Any experience with git-p4 to interact with Perforce repositories?

[EricP]

Hi all,

I'm a big Git fan and had the chance to "convert" some colleagues to the 
benefit of Git over Subversion, leading the conversion process and coaching 
them for their day-to-day use.

I'm now working in a place where the VCS is Perforce (sigh!). I must admit 
the cultural gap is non-negligible.

That being said, I did a quick search and found that there is git-p4 to use 
Git as a "client" to Perforce. Before getting that to work on my 
workstation, I'd like to know if anybody ever used that tool? If so, what 
kind of experience have you had with it? Are there any pitfalls, etc...

I'll probably get on setting that toolset in the next few days (next week) 
and will update this topic with any relevant info.

Any feedback is welcome.

Regards,

Eric

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

[git-users] Re: Problem getting mergetool (kdiff3) to work

[EricP]

Seems like I have an answer...

Today, kdiff3 was working when I needed to resolve merge conflicts, not 
working on others. Seems like there is merge resolution that is being 
handled by kdiff3 that Git could not go through. So the mergetool isn't 
only used for "showing" the conflicts and enabling the user to resolve 
conflicts by hand.

Pretty neat in my opinion. But I thought Git was equipped with cutting edge 
merge algorithms. Seems like KDiff3 has some complementary tools!

Does that make sense?

Eric


On Thursday, September 20, 2012 10:06:37 AM UTC-4, EricP wrote:
>
> Hi,
>
> I'm running windows 7 / 64 bits. Here's my version of Git:
> $ git --version
> git version 1.7.11.msysgit.1
>
> I installed KDiff3 version 0.9.96.
>
> I don't have any error message when I launch the mergetool: when a 
> conflict occurs during a merge, I use this command:
>
> $ git mergetool
>
> but no sign of life from kdiff3 at all. Not even an error message, no 
> warning. Just silently fails. I looked in the task manager and no 
> kdiff3-related processes are visible.
>
> That used to work in the past. I even tried uninstall / re-install Git on 
> my machine.
>
>
> Hope these bits of info are helpful!
>
>
>
>
>
> On Wednesday, September 19, 2012 9:06:12 AM UTC-4, Thomas Ferris 
> Nicolaisen wrote:
>>
>> What command are you trying to run, and what error message are you 
>> getting?
>>
>> Please also describe your environment (operating system, shell, version 
>> of Git, etc).
>>
>> On Wednesday, September 19, 2012 2:57:20 PM UTC+2, ericpar wrote:
>>>
>>> Hi, 
>>>
>>> I used to use 'kdiff3' as my mergetool for git. I'm running git v 
>>> 1.7.11.msysgit.1 on Windows 7 64 bits. It used to work for about 8 
>>> months up to this week. 
>>>
>>> I tried manually configuring my mergetool through these commands: 
>>>
>>> $ git config --global mergetool kdiff3 
>>>
>>> Also, I checked my ~/.gitconfig file had the following content: 
>>>
>>> (...) 
>>> [merge] 
>>> tool = kdiff3 
>>> [mergetool "kdiff3"] 
>>> path = C:/Program Files (x86)/KDiff3/kdiff3.exe 
>>> keepBackup = false 
>>> trustExitCode = false 
>>> [diff] 
>>> guitool = kdiff3 
>>> [difftool "kdiff3"] 
>>> path = c:/Program Files (x86)/KDiff3/kdiff3.exe 
>>>
>>> I can start kdiff3 from the command prompt without any issue: I 
>>> added the path to kdiff3.exe in my PATH env variable. 
>>>
>>> Any ideas what could cause my problem and how to fix it? 
>>>
>>> Cheers, 
>>>
>>> -- 
>>> Eric Parent 
>>> <mailto:er...@eparent.info> 
>>>
>>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/pXy3fPaCXwkJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

[git-users] Re: Problem getting mergetool (kdiff3) to work

[EricP]

Hi,

I'm running windows 7 / 64 bits. Here's my version of Git:
$ git --version
git version 1.7.11.msysgit.1

I installed KDiff3 version 0.9.96.

I don't have any error message when I launch the mergetool: when a conflict 
occurs during a merge, I use this command:

$ git mergetool

but no sign of life from kdiff3 at all. Not even an error message, no 
warning. Just silently fails. I looked in the task manager and no 
kdiff3-related processes are visible.

That used to work in the past. I even tried uninstall / re-install Git on 
my machine.


Hope these bits of info are helpful!





On Wednesday, September 19, 2012 9:06:12 AM UTC-4, Thomas Ferris Nicolaisen 
wrote:
>
> What command are you trying to run, and what error message are you getting?
>
> Please also describe your environment (operating system, shell, version of 
> Git, etc).
>
> On Wednesday, September 19, 2012 2:57:20 PM UTC+2, ericpar wrote:
>>
>> Hi, 
>>
>> I used to use 'kdiff3' as my mergetool for git. I'm running git v 
>> 1.7.11.msysgit.1 on Windows 7 64 bits. It used to work for about 8 
>> months up to this week. 
>>
>> I tried manually configuring my mergetool through these commands: 
>>
>> $ git config --global mergetool kdiff3 
>>
>> Also, I checked my ~/.gitconfig file had the following content: 
>>
>> (...) 
>> [merge] 
>> tool = kdiff3 
>> [mergetool "kdiff3"] 
>> path = C:/Program Files (x86)/KDiff3/kdiff3.exe 
>> keepBackup = false 
>> trustExitCode = false 
>> [diff] 
>> guitool = kdiff3 
>> [difftool "kdiff3"] 
>> path = c:/Program Files (x86)/KDiff3/kdiff3.exe 
>>
>> I can start kdiff3 from the command prompt without any issue: I 
>> added the path to kdiff3.exe in my PATH env variable. 
>>
>> Any ideas what could cause my problem and how to fix it? 
>>
>> Cheers, 
>>
>> -- 
>> Eric Parent 
>>  
>>
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/CKk0YSOPPvwJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] How to make a new branch with a portion of a branch?

[EricP]

Hi all, thanks for all you clever replies.

Here's what I've done:

$ git branch 2.2 tag2.1
$ git checkout 2.2
$ git merge 2.1
$ git checkout 2.1 
$ git revert --no-commit 
> On Sun, 17 Jun 2012 09:12:26 -0400 
> Eric Parent wrote: 
>
> >I've been working on a branch, say '2.1' and made a few commits on 
> > it. We've made a release and tagged the changeset at which the commit 
> > was produced, say 'tag2.1'. 
> > 
> >Development continued and a few more commits were made on that 
> > branch, the '2.1'. 
> > 
> >As the development goes, we think it would be a better idea to 
> > create a branch '2.2' that starts at the tag where the release was 
> > made and keep '2.1' only for the maintenance of that release. 
> > 
> > So here's what we have at the moment: 
> > 
> >  (tag2.1) 
> > branch 2.1 :  A   <-   B   <-   C   <-   D   <-   ...<- K 
> > 
> > Here is what we would like to have: 
> > 
> > 
> > changesets C up to K to be on a branch 2.2 starting at 'tag2.1': 
> > 
> > (tag2.1) 
> > branch 2.1: A   <-   B 
> > branch 2.2:<-   C'   <-   D'   <-E'   <-   ...<- 
> > K' 
> > 
> > Any hints? 
>
> 0) $ git checkout 2.1 
> 1) $ git branch 2.2 
> 2) $ git reset --hard tag2.1 
>
> This will: 
> 1) Create a branch named "2.2" which points to the same commit 
>the branch "2.1" currently does. 
> 2) Make the "2.1" branch point to the same commit the tag "tag2.1" 
>points (effectively truncating the branch). 
>
> You will have to forcibly push your 2.1 branch to your authoritative 
> (central) repo if you have it. 
>
> Your confusion about how to achieve what you want probably stems from 
> the fact you think a branch is something special, while in git both 
> tags and branches are simply references to a specific commit. 
> What constitutes a line of history then is commit chanining: each 
> commit references one or more parent commit(s) (except for the root 
> commit in a repository which references nothing). 
>
> Tags and branches are only different when it comes to committing 
> (committing on a branch updates the reference while committing when you 
> "have a tag checked out" does not update anything). 
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/EYGwcx9IyAYJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

[git-users] Re: How to make a new branch with a portion of a branch?

[EricP]

Hi Daniel,

I tried the following:

Le lundi 18 juin 2012 01:55:06 UTC-4, Daniel Dotsenko a écrit :
>
> // truncate 2.1
> git co 2.1
> git br 2.2// 2.2 will retain all commits you reset below
> git reset tag2.1 --hard
>
> // revert selected commits in what will be 2.2
> git co 2.2
>
>
Omitted the "revert" intentionnally for now.

$ pwd 
pk
$ cd ..
$ mkdir momo
$ cd momo
$ git init --bare
$ cd pk
$ git remote add momo ../momo
$ git checkout 2.1  # my branch with the new HEAD
$ git push momo 2.1
$ git checkout 2.2  # my new branch with the actual history
$ git push momo 2.2

Now, see if this repo is consistent when pulling from it... But seems like 
there is something wrong
$ cd ..
$ mkdir tata
$ cd tata
$ git clone ../momo
Cloning into 'momo'...
done.
warning: remote HEAD refers to nonexistent ref, unable to checkout.

Waiting until I do some more tests...

/Eric

 

>
> // and you have 2.2 that will still contain A, B, but will have reverseA, 
> reverseB at the tail. 
>
> branch 2.1: A   <-   B 
> branch 2.2: A   <-   B   <-   C   <-   D   <-   ...<- K <- reverseA   
> <-  reverseB
>
> All commits in 2.2 retain commit IDs, so for other team members revA and 
> revB will just be a pull/merge.
>
> The 2.1 branch, though will cause a bit of headache for some who rely on 
> it as remote. They will have to do
>
> git fetch --all -p 
>
> // -p purges local cache, should put new "remote" 2.1 in the right place 
> for people.
>
>
> Alternatively,
>
> // truncate 2.1
> git co A-1
> git br 2.2
> git reset tag2.1 --hard
>
> // revert selected commits in what will be 2.2
> git co 2.2
> git cherry-pick C..K
>
> But in this case, C-K in 2.2 branch will have new commit IDs.
>
> Daniel.
>
>
>
>
> On Sunday, June 17, 2012 6:12:26 AM UTC-7, EricP wrote:
>>
>> Hi, 
>>
>>I've been working on a branch, say '2.1' and made a few commits on 
>> it. We've made a release and tagged the changeset at which the commit 
>> was produced, say 'tag2.1'. 
>>
>>Development continued and a few more commits were made on that 
>> branch, the '2.1'. 
>>
>>As the development goes, we think it would be a better idea to 
>> create a branch '2.2' that starts at the tag where the release was 
>> made and keep '2.1' only for the maintenance of that release. 
>>
>> So here's what we have at the moment: 
>>
>>  (tag2.1) 
>> branch 2.1 :  A   <-   B   <-   C   <-   D   <-   ...<- K 
>>
>> Here is what we would like to have: 
>>
>>
>> changesets C up to K to be on a branch 2.2 starting at 'tag2.1': 
>>
>> (tag2.1) 
>> branch 2.1: A   <-   B 
>> branch 2.2:<-   C'   <-   D'   <-E'   <-   ...<- K' 
>>
>> Any hints? 
>>
>> I tried a few things like: 
>>
>> $ git checkout 2.1 
>> $ git branch 2.2 'tag2.1' 
>> $ git reset --hard 'tag2.1' 
>>
>> But that left me with an inconsistent repo... 
>>
>> $ git checkout 2.1 
>> $ git branch tmp 'tag2.1' 
>> $ git branch 2.2 'tag2.1' 
>> $ git rebase --onti 2.2 tmp 2.1 
>>
>> But did not leave me with the expected result either. 
>>
>> Any hint is welcome. 
>>
>> Cheers! 
>>
>> -- 
>> - Eric 
>>
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/6hg6HyozbIkJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

[git-users] Re: Paper on Git to Write, suggestions sought!

[EricP]

Hi,

Maybe a comparison with Mercurial (hg) would also be nice since it is,
in many points, similar in use and philosophy to GIT. But mercurial is
written in Python; for Windows users (and gui addicts) there is
TortoiseHG, in the same era that TortoiseSVN (and TortoiseCVS,
and ...). As I was writing this post, I was wondering and there is
TortoiseGIT also ! (see http://code.google.com/p/tortoisegit/).

Hope you could share your paper on this group! Anyways, I would be
happy to have a look at it...

Regards,

- Eric



On Dec 6, 9:20 am, Brett Viren  wrote:
> On Sun, Dec 5, 2010 at 7:12 PM, Neil Grogan  wrote:
>
> > I have a paper to write in College on a SCM system and I choose Git.
> > Just looking for one liners or links as to what you'd include or talk
> > about? Specifically in the research or improvements in Git coming up,
> > as I can't find much on that.
>
> I would include a discussion of Git's origin story.  I find it
> interesting how Linus choose a proprietary VCS (BitKeeper) to manage
> what is arguably the single most successful free software project and
> how it inevitably blew up and out of the ashes rose Linus's second
> triumph.
>
> -Brett.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

[git-users] Re: How to pull a branch on a remote repository when I don't have it locally

[EricP]

Thanks Luuk,
This answers my question.

- Eric

On Apr 23, 12:58 am, Luuk Paulussen  wrote:
> Hi Eric,
> You should be able to do:
>
> git fetch origin  #This should fetch all remote refs, including the
> remote origin/dij without updating anything locally.
> git checkout -b dij origin/dij  #this will create a local branch
> called dij to track origin/dij
>
> To reverse the effects of your initial pull, you might want to do:
> git checkout master
> git reset --hard origin/master  #nb, this will destroy any local
> changes to origin master.
>
> git pull basically does a git fetch followed by a git merge, which is
> not really what you wanted.  Once you have done the above, you should
> be able to do "git pull origin" on any branch to update that branch.
>
> Cheers,
> Luuk
>
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en
-~--~~~~--~~--~--~---

[git-users] Re: How to pull a branch on a remote repository when I don't have it locally

[EricP]

Hi Dan,

Thanks for replying to me.
Here is what I get from my home computer:

$ git branch -a
* master
  network
  origin/master
  origin/network

As you can see, there is nothing about the "dij" branch that is remote
and that is
But this is what I get from the computer at the lab:

$ git branch -a
  dij
* master
  network
  origin/dij
  origin/master
  origin/network

Looks strange...
Does this give you any insight about what I might have done wrong?

Again, what I did on my lab computer is
$ git push origin dij

"origin" being a different computer than the one where I work (either
at home or the lab).

And what I did on my home computer is
$ git pull origin dij


Regards,

- Eric
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en
-~--~~~~--~~--~--~---

[git-users] How to pull a branch on a remote repository when I don't have it locally

[EricP]

Hi,

My question might seem a little dumb and I beg your pardon for that. I
thought it would be natural to do what I wanted but it did not give
the expected results. Hence my question on this group...

I develop code at home and in a lab. I've setup a reference repository
on a secured server to allow for code share between my home and lab
computer.

>From the Lab, I have three branches: "master", "dij", "network". I
push my work to the safe repository almost every day.

At home, I have a repo with two branches so far: "master" and
"network".

Yesterday, I wanted to pull the "dij" branch from the safe repo to my
house. I am now thinking I did not issue the good command for
retrieving the "dij" branch on my computer:
$ git pull origin dij
where "origin" is the name of my safe repo.

My idea was to get the "dij" branch from origin attached to my actual
HEAD, locally. I wanted to retrieve the whole branch "dij" from the
"origin" repo to my home repo. What happened is it merged the dij/HEAD
to my master/HEAD.

Any idea of how this can be achieved, or even if this can be achieved
at all?

Thanks,

- Eric
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en
-~--~~~~--~~--~--~---