From: Fredrik Kuivinen <freku045@student.liu.se>
To: Junio C Hamano <junkio@cox.net>
Cc: Fredrik Kuivinen <freku045@student.liu.se>, git@vger.kernel.org
Subject: Re: Yet another set of merge test cases from the kernel tree.
Date: Tue, 20 Sep 2005 07:50:22 +0200 [thread overview]
Message-ID: <20050920055022.GB12979@c165.ib.student.liu.se> (raw)
In-Reply-To: <7vek7kfqs2.fsf@assigned-by-dhcp.cox.net>
On Mon, Sep 19, 2005 at 06:53:49PM -0700, Junio C Hamano wrote:
> Fredrik Kuivinen <freku045@student.liu.se> writes:
>
> > +def mergeFile(path, oSha, oMode, aSha, aMode, bSha, bMode,
> > + branch1Name, branch2Name):
> >...
> > + if aMode == oMode:
> > + mode = bMode
> > + else:
> > + mode = aMode
>
> Note: preferring "our" mode if there is a conflict instead of
> barfing. I do not know which is more useful in practice.
>
I just realized that this piece of code is broken with respect to type
changes. Trying to merge a symlink with a file should give us a
conflict.
> > +
> > + return [sha, mode, clean, merge]
> > +
> > +def updateFile(clean, sha, mode, path, cleanCache, onlyWd=False):
> > + updateCache = not onlyWd and (cleanCache or (not cleanCache and clean))
> > + updateWd = onlyWd or (not cleanCache and clean)
> > +
> > + if updateWd:
> > + prog = ['git-cat-file', 'blob', sha]
> > + if stat.S_ISREG(mode):
> > + try:
> > + os.unlink(path)
> > + except OSError:
> > + pass
> > + if mode & 0100:
> > + mode = 0777
> > + else:
> > + mode = 0666
> > + fd = os.open(path, os.O_WRONLY | os.O_TRUNC | os.O_CREAT, mode)
> > + proc = subprocess.Popen(prog, stdout=fd)
> > + proc.wait()
> > + os.close(fd)
> > + elif stat.S_ISLNK(mode):
> > + linkTarget = runProgram(prog)
> > + os.symlink(linkTarget, path)
> > + else:
> > + assert(False)
>
> Could it happen trying to update a file 'foo' when the working
> tree has 'foo/bar' file (i.e. D/F conflict)?
>
We get a list of all files and directories in getFilesAndDirs. This
list is then used in processEntry to check for d/f conflicts, so it
shouldn't happen in that case.
The rename path do currently not check for d/f conflicts so it could
probably happen there.
- Fredrik
next prev parent reply other threads:[~2005-09-20 5:50 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-07 16:47 [PATCH 0/2] A new merge algorithm, take 3 Fredrik Kuivinen
2005-09-07 16:50 ` [PATCH 1/2] Add '-i' flag to read-tree to make it ignore whats in the working directory Fredrik Kuivinen
2005-09-11 2:54 ` Unified merge driver pushed out to "master" branch Junio C Hamano
2005-09-11 21:05 ` Fredrik Kuivinen
2005-09-12 1:23 ` Junio C Hamano
2005-09-14 5:56 ` Another merge test case from the kernel tree Junio C Hamano
2005-09-14 16:11 ` Daniel Barkalow
2005-09-14 16:30 ` Junio C Hamano
2005-09-14 17:42 ` Fredrik Kuivinen
2005-09-14 17:51 ` Junio C Hamano
2005-09-15 0:47 ` Yet another set of merge test cases " Junio C Hamano
2005-09-19 16:13 ` Fredrik Kuivinen
2005-09-20 1:53 ` Junio C Hamano
2005-09-20 5:50 ` Fredrik Kuivinen [this message]
2005-09-07 16:51 ` [PATCH 2/2] A new merge algorithm Fredrik Kuivinen
2005-09-07 18:33 ` [PATCH 0/2] A new merge algorithm, take 3 Daniel Barkalow
2005-09-08 6:06 ` Fredrik Kuivinen
2005-09-08 15:27 ` Daniel Barkalow
2005-09-08 20:05 ` Fredrik Kuivinen
2005-09-08 21:27 ` Daniel Barkalow
2005-09-07 18:36 ` Junio C Hamano
[not found] ` <431F34FF.5050301@citi.umich.edu>
[not found] ` <7vvf1cz64l.fsf@assigned-by-dhcp.cox.net>
2005-09-08 15:06 ` Chuck Lever
2005-09-08 16:51 ` Junio C Hamano
2005-09-08 17:19 ` Linus Torvalds
2005-09-08 17:51 ` Junio C Hamano
2005-09-08 18:16 ` Chuck Lever
2005-09-08 18:35 ` Linus Torvalds
2005-09-08 18:58 ` Chuck Lever
2005-09-08 20:59 ` Linus Torvalds
2005-09-09 7:44 ` [RFH] Merge driver Junio C Hamano
2005-09-09 16:05 ` Daniel Barkalow
2005-09-09 16:43 ` Junio C Hamano
2005-09-09 17:25 ` Daniel Barkalow
2005-09-11 4:58 ` Junio C Hamano
2005-09-12 21:08 ` Fredrik Kuivinen
2005-09-12 21:16 ` Junio C Hamano
2005-09-13 20:33 ` Fredrik Kuivinen
2005-09-13 20:46 ` Junio C Hamano
2005-09-08 20:54 ` [PATCH 0/2] A new merge algorithm, take 3 Junio C Hamano
2005-09-08 21:23 ` A Large Angry SCM
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050920055022.GB12979@c165.ib.student.liu.se \
--to=freku045@student.liu.se \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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.
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).