Re: [fossil-users] merge conflict: a doubt

2016-03-03 Thread Stephan Beal 
On Thu, Mar 3, 2016 at 12:38 PM, Luca Ferrari  wrote:

> Could it be repo.cksum off?
>

No - that one controls whether or not the so-called "R-card" is generated
and/or validated (the R-card is another level of integrity checking, but is
expensive to calculate, so it is optional).

-- 
- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
"Freedom is sloppy. But since tyranny's the only guaranteed byproduct of
those who insist on a perfect world, freedom will have to do." -- Bigby Wolf
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] merge conflict: a doubt

2016-03-03 Thread Luca Ferrari 
On Thu, Mar 3, 2016 at 12:11 PM, Stephan Beal  wrote:
> Please update if at all possible. 1.33 is almost a year old, and the past 12
> months have seen lots of activity:

Yes, I'm updating.

> My currently hypotheses is that you perhaps had an editor session active,
> but unsaved, for one of the conflicting files. (i have done that once or
> twice, and the result is similar to what you describe.)

No, I'm sure about it.
Could it be repo.cksum off?

Luca
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] merge conflict: a doubt

2016-03-03 Thread Stephan Beal 
On Thu, Mar 3, 2016 at 8:17 AM, Luca Ferrari  wrote:

> My fossil version is 1.33 [bd97cb7306].
> ANy other idea?
>

Please update if at all possible. 1.33 is almost a year old, and the past
12 months have seen lots of activity:

http://www.fossil-scm.org/index.html/reports?type=a=bymonth

My currently hypotheses is that you perhaps had an editor session active,
but unsaved, for one of the conflicting files. (i have done that once or
twice, and the result is similar to what you describe.)

-- 
- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
"Freedom is sloppy. But since tyranny's the only guaranteed byproduct of
those who insist on a perfect world, freedom will have to do." -- Bigby Wolf
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] merge conflict: a doubt

2016-03-02 Thread Luca Ferrari 
On Wed, Mar 2, 2016 at 1:31 PM, Richard Hipp  wrote:
> On 3/2/16, Luca Ferrari  wrote:
>>
>> % fossil commit
>> possible unresolved merge conflict in ./classes/PraticaBase.php
>> abort due to unresolved merge conflicts; use --allow-conflict to override
>>
>
> That means your input file "PraticaBase.php" contains one or more
> lines that match the
> https://www.fossil-scm.org/fossil/artifact/b2502f631c761f2c?ln=143-146
> merge marker patterns.  This suggests that you did not fully resolve
> the merge conflict.

Uhm...I double checked and ran my tests, and check the php syntax, no
errors and no "merge" related sections.
My fossil version is 1.33 [bd97cb7306].
ANy other idea?

Luca
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] merge conflict: a doubt

2016-03-02 Thread Richard Hipp 
On 3/2/16, Luca Ferrari  wrote:
>
> % fossil commit
> possible unresolved merge conflict in ./classes/PraticaBase.php
> abort due to unresolved merge conflicts; use --allow-conflict to override
>

That means your input file "PraticaBase.php" contains one or more
lines that match the
https://www.fossil-scm.org/fossil/artifact/b2502f631c761f2c?ln=143-146
merge marker patterns.  This suggests that you did not fully resolve
the merge conflict.
-- 
D. Richard Hipp
d...@sqlite.org
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] merge conflict: a doubt

2016-03-02 Thread Luca Ferrari 
Hi all,
today I merged from trunk into a branch of my project and got a
conflict on a file:

% fossil status
..
CONFLICT   classes/PraticaBase.php
EDITED classes/ProtocolloInfoStruct.php
MERGED_WITH cdbb6ceba8fdb2b51410b76af7ce5b86b691e8a9

So I edited the conflicting file and resolved manually the merge, then
tried to commit but got a warning:

% fossil commit
possible unresolved merge conflict in ./classes/PraticaBase.php
abort due to unresolved merge conflicts; use --allow-conflict to override

Now, as far as I know, fossil was not minded about conflicts, why did
the manually modified file still be preventing me to do a plain
commit?
I was able to commit it via --allow-conflict, but I guess this should
not be happen.

Thanks,
Luca
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users