Re: [fossil-users] MERGE problem (with renames/deletes)

On Sun, Sep 27, 2015 at 1:40 AM, wrote: > I’ve been reading much of this discussion so far, and although it has > focused primarily on the possibility of a deleted file not merging in as > one may have expected, I have to say that my report was not about that. > > What I reported

Re: [fossil-users] MERGE problem (with renames/deletes)

I’ve been reading much of this discussion so far, and although it has focused primarily on the possibility of a deleted file not merging in as one may have expected, I have to say that my report was not about that. What I reported had to do with the addition of new files in trunk that were

Re: [fossil-users] MERGE problem (with renames/deletes)

On Sun, Sep 27, 2015 at 12:18 AM, Steve Stefanovich wrote: > >>‎ Yes, we discussed this one the list before. The fossil should at > >> least warn about it, or more accurately raise a conflict, because > >> that's what it really is. It's a bug. > > > I can see a desire to raise a

Re: [fossil-users] MERGE problem (with renames/deletes)

>>‎ Yes, we discussed this one the list before. The fossil should at >> least warn about it, or more accurately raise a conflict, because >> that's what it really is. It's a bug. > I can see a desire to raise a merge conflict, but I don't think it > is a bug. Isn't it reasonable to say "removing

Re: [fossil-users] MERGE problem (with renames/deletes)

To: Fossil SCM user's discussion Reply To: Fossil SCM user's discussion Subject: Re: [fossil-users] MERGE problem Is there a chance that these are files you previously deleted from a branch? For example: 1. Create branch from trunk. 2. Deleted files from branch and committed. 3. Made changes to files

Re: [fossil-users] MERGE problem (with renames/deletes)

gt; ‎ > I'm not sure what to do with renaming. > > > *From: *Scott Robison > *Sent: *Friday, 25 September 2015 02:51 > *To: *Fossil SCM user's discussion > *Reply To: *Fossil SCM user's discussion > *Subject: *Re: [fossil-users] MERGE problem > > Is there a chan

[fossil-users] MERGE problem

I’m in some branch and doing a MERGE from trunk. Everything OK except for some newly added files on trunk that were not in the current branch, but a merge was expected to deal with them also. But, they do not ‘copy over’. The result is the project is incomplete as the updated files depend

Re: [fossil-users] MERGE problem

Sent: Thursday, September 24, 2015 5:59 PM To: Fossil SCM user's discussion Subject: [fossil-users] MERGE problem I’m in some branch and doing a MERGE from trunk. Everything OK except for some newly added files on trunk that were not in the current branch, but a merge was expected to deal with the

Re: [fossil-users] MERGE problem

On 9/24/15, Tony Papadimitriou wrote: > I’m in some branch and doing a MERGE from trunk. > > Everything OK except for some newly added files on trunk that were not in > the current branch, but a merge was expected to deal with them also. > But, they do not ‘copy over’. The result

Re: [fossil-users] MERGE problem

Is there a chance that these are files you previously deleted from a branch? For example: 1. Create branch from trunk. 2. Deleted files from branch and committed. 3. Made changes to files on trunk and committed. 4. Merged from trunk expecting the changed files to come into branch. There are