Jeff Latimer wrote:
have. However after that I end up with this:
[EMAIL PROTECTED] wing]$ git rebase --continue
You must edit all merge conflicts and then
mark them as resolved using git update-index
I also have the options of git rebase --abort and git rebase --skip
which I am not sure of
Jeff Latimer wrote:
Mike I suppose that the problem is that wrapping your mind around git
and working out how to handle patches, especially as it takes time to
get them accepted, revert them and manage trees etc is difficult. I
don't know about other but I have had a number of perplexing and
"Colin Pitrat" <[EMAIL PROTECTED]> wrote:
How is it easier to do
cvs -z3 -d:pserver:[EMAIL PROTECTED]:/home/wine co -P wine
than
git clone git://source.winehq.org/git/wine.git wine
In both case, you just have to copy/paste the command line from the web
page.
Right. But if you compare the si
On Monday 21 August 2006 21:22, Jeff Latimer wrote:
> Mike I suppose that the problem is that wrapping your mind around git
> and working out how to handle patches, especially as it takes time to
> get them accepted, revert them and manage trees etc is difficult.
The way git does version control
* On Mon, 21 Aug 2006, EA Durbin wrote:
>
> > How is it easier to do
> > cvs -z3 -d:pserver:[EMAIL PROTECTED]:/home/wine co -P wine
> >
> > than
> > git clone git://source.winehq.org/git/wine.git wine
>
> because git doesn't seem to work on my machine,
EA, so this simply means my notes on taki
How is it easier to do
cvs -z3 -d:pserver:[EMAIL PROTECTED]:/home/wine co -P wine
than
git clone git://source.winehq.org/git/wine.git wine
because git doesn't seem to work on my machine, and I've never had problems
with the tried and trusted CVS, I'm familiar with CVS as are the majority of
EA Durbin wrote:
>
> if your not going to be submitting any patches its easier to get wine
> from CVS than GIT.
>
How is it easier to do
cvs -z3 -d:pserver:[EMAIL PROTECTED]:/home/wine co -P wine
than
git clone git://source.winehq.org/git/wine.git wine
In both case, you just have to copy/paste
Jeff Latimer wrote:
Mike I suppose that the problem is that wrapping your mind around git
and working out how to handle patches, especially as it takes time to
get them accepted, revert them and manage trees etc is difficult. I
don't know about other but I have had a number of perplexing and
If CVS goes, is there another way to see what patches have been applied to
the tree? The git does not seem to do that for me and cvs.winehq.org is a
fairly easy lookup.
Jeff
You can view the [EMAIL PROTECTED] over newsreader, but I still like the
web interface for CVS to view APPDB code
On 8/21/06, Jeff Latimer <[EMAIL PROTECTED]> wrote:
If CVS goes, is there another way to see what patches have been applied to
the tree? The git does not seem to do that for me and cvs.winehq.org is a
fairly easy lookup.
Jeff
To visualize the history just do something like this.
$ gitk -
Mike McCormack wrote:
Jeff Latimer wrote:
If CVS goes, is there another way to see what patches have been
applied to the tree? The git does not seem to do that for me and
cvs.winehq.org is a fairly easy lookup.
If you have a local git tree, "git whatchanged" will give you the
complete c
Jeff Latimer wrote:
If CVS goes, is there another way to see what patches have been applied
to the tree? The git does not seem to do that for me and cvs.winehq.org
is a fairly easy lookup.
If you have a local git tree, "git whatchanged" will give you the
complete commit history.
There's
Alexandre Julliard wrote:
Michael Stefaniuc <[EMAIL PROTECTED]> writes:
Are there any plans to get rid of CVS? I would guess keeping the CVS
tree sync from the git tree is low maintanance so it can be kept around
"forewever".
Yes, as long as it doesn't require any maint
Michael Stefaniuc <[EMAIL PROTECTED]> writes:
> But i also guess that he likes to receive more patches than less. For
> the casual/new Wine patch submitter CVS is easier to use. If those
> submitters do more Wine work they will see the light anyway and migrate
> to git ;)
More patches are good, b
On Mon, Aug 21, 2006 at 11:33:28AM +0200, Michael Stefaniuc wrote:
> > My changes to the website reflect that support for CVS may not last
> > forever...
> Are there any plans to get rid of CVS? I would guess keeping the CVS
> tree sync from the git tree is low maintanance so it can be kept
> arou
Mike McCormack wrote:
>
> Robert Shearman wrote:
>
>> I think we should leave the reference to the CVS tree page (but still
>> add a link to the Git tree). Some people find it easier to work with
>> CVS than Git.
>
>
> I think Alexandre would prefer to receive patch submissions in Git
> format,
Robert Shearman wrote:
I think we should leave the reference to the CVS tree page (but still
add a link to the Git tree). Some people find it easier to work with CVS
than Git.
I think Alexandre would prefer to receive patch submissions in Git
format, as they are easier to apply and waste le
> Date: Sun, 20 Aug 2006 14:45:03 +0300 (EEST)
> From: Saulius Krasuckas <[EMAIL PROTECTED]>
>
> > Date: Fri, 18 Aug 2006 11:36:31 -0500
> > From: EA Durbin <[EMAIL PROTECTED]>
> >
> > When trying to run git clone git://source.winehq.org/git/wine.git wine or
> > git clone http://source.winehq.or
> Date: Fri, 18 Aug 2006 11:36:31 -0500
> From: EA Durbin <[EMAIL PROTECTED]>
>
> 1.0.3 is the latest version in the ubuntu repository, even after
> uncommenting all the #deb lines in the apt config file and updating.
>
> When trying to run git clone git://source.winehq.org/git/wine.git wine or
> Agreed, CVS is much easier to use in my own opinion,
But in what way it is? For example I dislike managament of env-variables
at all. That's why I didn't like CVS :-p
In the way that the instructions on the wine page just worked, and for
familiarity purposes, git is rather new to me, and
> Date: Fri, 18 Aug 2006 08:18:43 -0500
> From: EA Durbin <[EMAIL PROTECTED]>
>
> > From: Robert Shearman <[EMAIL PROTECTED]>
> > Date: Fri, 18 Aug 2006 12:09:42 +0100
> >
> > I think we should leave the reference to the CVS tree page (but still
> > add a link to the Git tree). Some people find
er to navigate
than that of the git web interface.
From: Robert Shearman <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
CC: wine-devel@winehq.org
Subject: Re: LOSTWAGES: Replace references to CVS with Git
Date: Fri, 18 Aug 2006 12:09:42 +0100
Mike McCormack wrote:
Index: templates/en/developme
Mike McCormack wrote:
Index: templates/en/development.template
===
RCS file: /home/wine/lostwages/templates/en/development.template,v
retrieving revision 1.6
diff -u -p -r1.6 development.template
--- templates/en/development.templat
23 matches
Mail list logo
