From: "Karl Hasselström" <kha@treskal.com>
To: Avery Pennarun <apenwarr@gmail.com>
Cc: Jeff King <peff@peff.net>, Ingo Molnar <mingo@elte.hu>,
git@vger.kernel.org
Subject: Re: git annoyances
Date: Fri, 11 Apr 2008 09:00:16 +0200 [thread overview]
Message-ID: <20080411070016.GA25970@diana.vm.bytemark.co.uk> (raw)
In-Reply-To: <32541b130804100805o4ad1e9a6x38e9b1fcf17c5d1d@mail.gmail.com>
On 2008-04-10 11:05:07 -0400, Avery Pennarun wrote:
> On Thu, Apr 10, 2008 at 4:41 AM, Karl Hasselström <kha@treskal.com> wrote:
>
> > The @rev is called a "peg revision", and is different from the
> > "operative revision" specified with the -r flag. The peg revision
> > is used in conjunction with a path to specify the file (or
> > directory) you want, and the operative revision is used to specify
> > which revision of that file you mean.
>
> Yes, but I believe you get the one from @rev if you don't specify
> -r.
>
> For example, I can ask for an "svn diff svn://blahblah@56
> svn://blahblah@59" and it'll feed it to me as expected.
Ah, I didn't know that. But the URL I threw at you agrees:
> Note that even when you don't explicitly supply a peg revision or
> operative revision, they are still present. For your convenience,
> the default peg revision is BASE for working copy items and HEAD for
> repository URLs. And when no operative revision is provided, it
> defaults to being the same revision as the peg revision.
Clearly, I need to use Subversion more, and not fool around with git
all the time. :-)
> > (This complexity is needed because subversion has a concept of
> > file identity.)
>
> File renames make diffing and merging complicated no matter whether
> you track them or not.
>
> svn's tracking of file identity is additional, but doesn't increase
> the (UI) complexity in the common case. At least with svn, a newbie
> can even get real work done without even knowing about -r *or*
> @notation.
I don't quite agree with you here. Subversion stores extra state, and
that state needs to be considered (in the general case) when
predicting what Subversion will do. There are a large number of simple
cases where the user doesn't have to care, as you say, but every so
often there's a case that's not so simple, and in those cases I
_really_ prefer git's data model to Subversion's.
> Compare that to arbitrary differences in behaviour between
> "git-fetch" vs "git-fetch a" vs "git-fetch a b", or the difference
> between HEAD^ and HEAD~1 and HEAD@1. git is very powerful, but also
> definitely more complex for beginners.
Oh, I'm not arguing on that point. I like git because it's beutiful on
the _inside_.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
next prev parent reply other threads:[~2008-04-11 7:02 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-09 10:14 git annoyances Ingo Molnar
2008-04-09 10:41 ` Björn Steinbrink
2008-04-09 14:57 ` Jeff King
2008-04-09 15:15 ` [PATCH] git-remote: show all remotes with "git remote show" Jeff King
2008-04-09 16:54 ` Johannes Schindelin
2008-04-10 10:56 ` Junio C Hamano
2008-04-09 20:07 ` Ingo Molnar
2008-04-10 19:59 ` Ingo Molnar
2008-04-09 17:08 ` git annoyances Avery Pennarun
2008-04-10 8:41 ` Karl Hasselström
2008-04-10 15:05 ` Avery Pennarun
2008-04-11 7:00 ` Karl Hasselström [this message]
2008-04-09 20:08 ` Friendly refspecs (Was: Re: git annoyances) Teemu Likonen
2008-04-09 20:32 ` Avery Pennarun
2008-04-09 20:34 ` Jeff King
2008-04-09 22:25 ` Teemu Likonen
2008-04-09 22:51 ` Jeff King
2008-04-10 0:03 ` Jeff King
2008-04-10 0:11 ` Jeff King
2008-04-10 7:51 ` Friendly refspecs Junio C Hamano
2008-04-10 8:03 ` Jeff King
[not found] ` <bd6139dc0804091616k53f4e0c1sf75aa9585c5a54c5@mail.gmail.com>
2008-04-10 0:33 ` Friendly refspecs (Was: Re: git annoyances) Jeff King
2008-04-10 7:58 ` Sverre Rabbelier
2008-04-13 9:31 ` Friendly refspecs Teemu Likonen
2008-04-13 9:34 ` [PATCH] Add examples section to 'git fetch' manual Teemu Likonen
2008-04-13 18:56 ` Junio C Hamano
2008-04-13 19:48 ` Matt Graham
2008-04-13 20:05 ` Teemu Likonen
2008-04-14 1:02 ` Junio C Hamano
2008-04-16 3:48 ` Friendly refspecs Jeff King
2008-04-16 4:25 ` Jeff King
2008-04-16 4:41 ` Junio C Hamano
2008-04-16 4:47 ` Jeff King
2008-04-16 15:42 ` Daniel Barkalow
2008-04-16 20:03 ` Junio C Hamano
2008-04-22 10:56 ` Jeff King
2008-04-22 16:52 ` Junio C Hamano
2008-04-22 17:19 ` Daniel Barkalow
2008-04-22 20:12 ` Jeff King
2008-04-22 20:05 ` Jeff King
2008-04-22 20:45 ` Junio C Hamano
2008-04-22 21:52 ` Jeff King
2008-04-23 4:24 ` Teemu Likonen
2008-04-23 5:52 ` Junio C Hamano
2008-04-23 6:24 ` Andreas Ericsson
2008-04-23 9:16 ` Jeff King
2008-04-23 9:21 ` Jeff King
2008-04-23 11:15 ` Teemu Likonen
2008-04-09 21:21 ` Junio C Hamano
2008-04-10 7:38 ` Teemu Likonen
2008-04-12 18:59 ` git annoyances Santiago Gala
2008-04-09 19:21 ` Daniel Barkalow
2008-04-09 20:41 ` Ingo Molnar
2008-04-10 14:08 ` Daniel Barkalow
2008-04-09 21:04 ` Junio C Hamano
2008-04-09 21:39 ` Jon Loeliger
2008-04-09 23:45 ` Nicolas Pitre
2008-04-09 21:45 ` Jeff King
2008-04-09 23:56 ` André Goddard Rosa
2008-04-10 19:45 ` Govind Salinas
2008-04-10 6:08 ` Jean-Christian de Rivaz
2008-04-10 8:19 ` Sverre Rabbelier
2008-04-10 11:47 ` git-bisect annoyances Ingo Molnar
2008-04-11 5:41 ` Christian Couder
2008-04-11 11:41 ` Ingo Molnar
2008-04-12 6:56 ` Christian Couder
2008-04-11 5:56 ` Junio C Hamano
2008-04-10 23:25 ` [PATCH] When a remote is added but not fetched, tell the user Gabriel
2008-04-11 15:21 ` Johannes Schindelin
2008-04-11 18:35 ` Gabriel
2008-04-11 18:39 ` [PATCH] Default to fetching a remote after adding it Gabriel
2008-04-11 19:17 ` Stephen Sinclair
2008-04-12 14:33 ` Johannes Schindelin
2008-04-12 15:13 ` Gabriel
2008-04-12 15:24 ` Johannes Schindelin
2008-04-11 19:08 ` [PATCH] When a remote is added but not fetched, tell the user Teemu Likonen
2008-04-11 21:39 ` Junio C Hamano
2008-04-11 22:35 ` Sverre Rabbelier
2008-04-11 23:15 ` Junio C Hamano
2008-04-11 23:20 ` Sverre Rabbelier
2008-04-15 3:15 ` Miles Bader
2008-04-11 19:29 ` [PATCH] Default to fetching a remote after adding it Gabriel
2008-04-11 19:36 ` Wincent Colaiuta
2008-04-11 19:46 ` Gabriel
2008-04-11 10:15 ` git annoyances Luciano Rocha
2008-04-11 10:27 ` Wincent Colaiuta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080411070016.GA25970@diana.vm.bytemark.co.uk \
--to=kha@treskal.com \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).