* Confusion using git on svn server
@ 2009-06-20 20:26 Matthieu Stigler
0 siblings, 0 replies; 6+ messages in thread
From: Matthieu Stigler @ 2009-06-20 20:26 UTC (permalink / raw
To: git
Hi
I just began using git on a svn file, which seems really nice. I'm for
now confused with a git operation, as maybe my mind is still thinking
with svn vision.
As I understood, unlike svn, you can make many commit without sending
them to the server, and then then sending them in one block with git-svn
dcommit (if I'm right, with push if git server).
So two questions:
-Where can I find documentation on that? Didn't find mention on it in
git user manual or git-svn crash course.
-say I want to know, before doing git-svn dcommit, which commits will be
sent, and if this will do a conflict... is there a way to check that
before sending the commits?
My main concern is that in my git log, I have a commit and its "revert",
will it be sent as two different commits to svn? I would love they are
not sent at all as they represent a "neutral" operation.
Thanks a lot!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Confusion using git on svn server
@ 2009-06-20 20:28 Matthieu Stigler
2009-06-21 7:49 ` Florian Weimer
0 siblings, 1 reply; 6+ messages in thread
From: Matthieu Stigler @ 2009-06-20 20:28 UTC (permalink / raw
To: git
Hi
I just began using git on a svn file, which seems really nice. I'm for
now confused with a git operation, as maybe my mind is still thinking
with svn vision.
As I understood, unlike svn, you can make many commit without sending
them to the server, and then then sending them in one block with git-svn
dcommit (if I'm right, with push if git server).
So two questions:
-Where can I find documentation on that? Didn't find mention on it in
git user manual or git-svn crash course.
-say I want to know, before doing git-svn dcommit, which commits will be
sent, and if this will do a conflict... is there a way to check that
before sending the commits?
My main concern is that in my git log, I have a commit and its "revert",
will it be sent as two different commits to svn? I would love they are
not sent at all as they represent a "neutral" operation.
Thanks a lot!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Confusion using git on svn server
2009-06-20 20:28 Confusion using git on svn server Matthieu Stigler
@ 2009-06-21 7:49 ` Florian Weimer
2009-06-21 9:09 ` Matthieu Stigler
0 siblings, 1 reply; 6+ messages in thread
From: Florian Weimer @ 2009-06-21 7:49 UTC (permalink / raw
To: git
* Matthieu Stigler:
> My main concern is that in my git log, I have a commit and its
> "revert", will it be sent as two different commits to svn? I would
> love they are not sent at all as they represent a "neutral" operation.
They will be sent as a separate commits by default.
You can use "git rebase -i git-svn" to edit your local history before
submitting it, though.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Confusion using git on svn server
2009-06-21 7:49 ` Florian Weimer
@ 2009-06-21 9:09 ` Matthieu Stigler
2009-06-21 9:32 ` Florian Weimer
0 siblings, 1 reply; 6+ messages in thread
From: Matthieu Stigler @ 2009-06-21 9:09 UTC (permalink / raw
To: git; +Cc: Florian Weimer
Florian Weimer a écrit :
> * Matthieu Stigler:
>
>
>> My main concern is that in my git log, I have a commit and its
>> "revert", will it be sent as two different commits to svn? I would
>> love they are not sent at all as they represent a "neutral" operation.
>>
>
> They will be sent as a separate commits by default.
>
> You can use "git rebase -i git-svn" to edit your local history before
> submitting it, though.
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
Excellent! This is exactly what I was looking for, thanks!
I had a minor issue as the commits I wanted to remove (a modif and its
revert) were the last one, so I could not remove both in the same time,
as said:
However, if you remove everything, the rebase will be aborted.
So I just added a minor third commit in order to remove the two first.
Is there a better way to do than this workaround? Something with git
rebase --onto (two last?)
Thanks a lot!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Confusion using git on svn server
2009-06-21 9:09 ` Matthieu Stigler
@ 2009-06-21 9:32 ` Florian Weimer
[not found] ` <fabb9a1e0906212304o2b61d081i4cf72300be8bd775@mail.gmail.com>
0 siblings, 1 reply; 6+ messages in thread
From: Florian Weimer @ 2009-06-21 9:32 UTC (permalink / raw
To: Matthieu Stigler; +Cc: git
* Matthieu Stigler:
> So I just added a minor third commit in order to remove the two
> first. Is there a better way to do than this workaround? Something
> with git rebase --onto (two last?)
If you want to remove the last two commits, you can use "git reset
HEAD^^". This moves your working copy (and the associated master
branch) back in time.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Confusion using git on svn server
[not found] ` <fabb9a1e0906212304o2b61d081i4cf72300be8bd775@mail.gmail.com>
@ 2009-06-22 6:16 ` Florian Weimer
0 siblings, 0 replies; 6+ messages in thread
From: Florian Weimer @ 2009-06-22 6:16 UTC (permalink / raw
To: Sverre Rabbelier; +Cc: git, Matthieu Stigler
* Sverre Rabbelier:
> It moves your tree only if you add --hard, although in case of a reverted
> revert it doesn't matter.
Well, this is part of the checkout/reset confusion. Even without
--hard, reset changes where the working tree is located in the
history. But it doesn't perform a checkout.
As you said, with a rever, this shouldn't matter.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-06-22 6:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-20 20:28 Confusion using git on svn server Matthieu Stigler
2009-06-21 7:49 ` Florian Weimer
2009-06-21 9:09 ` Matthieu Stigler
2009-06-21 9:32 ` Florian Weimer
[not found] ` <fabb9a1e0906212304o2b61d081i4cf72300be8bd775@mail.gmail.com>
2009-06-22 6:16 ` Florian Weimer
-- strict thread matches above, loose matches on Subject: below --
2009-06-20 20:26 Matthieu Stigler
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).