On 5/1/15, Fossil User <fossil.scm.u...@gmail.com> wrote:
> Hello.
>
> I'm using version 1.32 [6c40678e91] and I can't understand how merge
> operation works.
> Here is example of what I'm try to do:
>
> 1. branch: trunk
> 2. commit: add file a and add file b
>
> 3. switch to branch b:
> 4. commit: move b to c

How is that possible since you just added file b to the repository on
trunk and so it does not yet exist on branch b?

> 5 commit: add new file b
>
> 6. merge b into trunk
> but, in this step file b is not present, why?
>
> Example session: http://pastebin.com/cYTjMXeb
> Repo file: http://s000.tinyupload.com/?file_id=81023289595312112568
> <http://s000.tinyupload.com/index.php?file_id=81023289595312112568>
>
> Best,
> Anofos
>


-- 
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

Reply via email to