Fossil SCM

(cherry-pick) Fix a timeline bug, showing an unintended arrow when closing a fork.

jan.nijtmans 2016-07-05 14:30 UTC trunk

Commit 4cae5c94ea2241b34375921fe384d5400ed1a229

Parent 3aa86af6aaad5d1…

3 files changed +1 -1 +1 -1 +1 -1

~ Dockerfile ~ Dockerfile ~ src/graph.c

M Dockerfile

+1 -1

		--- Dockerfile
		+++ Dockerfile
		@@ -5,11 +5,11 @@
5	5
6	6	### Now install some additional parts we will need for the build
7	7	RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8	8
9	9	### If you want to build "trunk", change the next line accordingly.
10		-ENV FOSSIL_INSTALL_VERSION release
	10	+ENV FOSSIL_INSTALL_VERSION branch-1.35
11	11
12	12	RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" \| tar zx
13	13	RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-load && make && make install
14	14	RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" \| tar zx
15	15	RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs
16	16

	--- Dockerfile
	+++ Dockerfile
	@@ -5,11 +5,11 @@
5
6	### Now install some additional parts we will need for the build
7	RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9	### If you want to build "trunk", change the next line accordingly.
10	ENV FOSSIL_INSTALL_VERSION release
11
12	RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" \| tar zx
13	RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-load && make && make install
14	RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" \| tar zx
15	RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs
16

	--- Dockerfile
	+++ Dockerfile
	@@ -5,11 +5,11 @@
5
6	### Now install some additional parts we will need for the build
7	RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9	### If you want to build "trunk", change the next line accordingly.
10	ENV FOSSIL_INSTALL_VERSION branch-1.35
11
12	RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" \| tar zx
13	RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-load && make && make install
14	RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" \| tar zx
15	RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs
16

M Dockerfile

+1 -1

		--- Dockerfile
		+++ Dockerfile
		@@ -5,11 +5,11 @@
5	5
6	6	### Now install some additional parts we will need for the build
7	7	RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8	8
9	9	### If you want to build "trunk", change the next line accordingly.
10		-ENV FOSSIL_INSTALL_VERSION release
	10	+ENV FOSSIL_INSTALL_VERSION branch-1.35
11	11
12	12	RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" \| tar zx
13	13	RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-load && make && make install
14	14	RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" \| tar zx
15	15	RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs
16	16

	--- Dockerfile
	+++ Dockerfile
	@@ -5,11 +5,11 @@
5
6	### Now install some additional parts we will need for the build
7	RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9	### If you want to build "trunk", change the next line accordingly.
10	ENV FOSSIL_INSTALL_VERSION release
11
12	RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" \| tar zx
13	RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-load && make && make install
14	RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" \| tar zx
15	RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs
16

	--- Dockerfile
	+++ Dockerfile
	@@ -5,11 +5,11 @@
5
6	### Now install some additional parts we will need for the build
7	RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9	### If you want to build "trunk", change the next line accordingly.
10	ENV FOSSIL_INSTALL_VERSION branch-1.35
11
12	RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" \| tar zx
13	RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-load && make && make install
14	RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" \| tar zx
15	RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs
16

M src/graph.c

+1 -1

		--- src/graph.c
		+++ src/graph.c
		@@ -474,11 +474,11 @@
474	474	for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
475	475	int parentRid;
476	476
477	477	if( pRow->iRail>=0 ){
478	478	if( pRow->pChild==0 && !pRow->timeWarp ){
479		- if( omitDescenders \|\| pRow->isLeaf ){
	479	+ if( omitDescenders \|\| count_nonbranch_children(pRow->rid)==0 ){
480	480	/* no-op */
481	481	}else{
482	482	riser_to_top(pRow);
483	483	}
484	484	}
485	485

	--- src/graph.c
	+++ src/graph.c
	@@ -474,11 +474,11 @@
474	for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
475	int parentRid;
476
477	if( pRow->iRail>=0 ){
478	if( pRow->pChild==0 && !pRow->timeWarp ){
479	if( omitDescenders \|\| pRow->isLeaf ){
480	/* no-op */
481	}else{
482	riser_to_top(pRow);
483	}
484	}
485

	--- src/graph.c
	+++ src/graph.c
	@@ -474,11 +474,11 @@
474	for(pRow=p->pLast; pRow; pRow=pRow->pPrev){
475	int parentRid;
476
477	if( pRow->iRail>=0 ){
478	if( pRow->pChild==0 && !pRow->timeWarp ){
479	if( omitDescenders \|\| count_nonbranch_children(pRow->rid)==0 ){
480	/* no-op */
481	}else{
482	riser_to_top(pRow);
483	}
484	}
485

Keyboard Shortcuts

Open search /

Next entry (timeline) j

Previous entry (timeline) k

Open focused entry Enter

Show this help ?

Toggle theme Top nav button