##// END OF EJS Templates
vcs: Return merge reference in merge response....
vcs: Return merge reference in merge response. Previously we returned only the merge commit id. Now we set a bookmark(hg) or branch reference(git) to point to the merge commit. By returning a merge reference we have both informations available (id and name)

File last commit:

r1:854a839a default
r1051:668a5e47 default
Show More
patch_changeset.html
24 lines | 589 B | text/html | HtmlLexer
project: added all source files and assets
r1 %if h.is_hg(c.rhodecode_repo):
# ${c.rhodecode_repo.alias.upper()} changeset patch
# User ${c.commit.author |n}
# Date ${c.commit.date}
# Node ID ${c.commit.raw_id}
${c.parent_tmpl}
${c.commit.message |n}
%elif h.is_git(c.rhodecode_repo):
From ${c.commit.raw_id} ${c.commit.date}
From: ${c.commit.author |n}
Date: ${c.commit.date}
Subject: [PATCH] ${c.commit.message |n}
---
%elif h.is_svn(c.rhodecode_repo):
# ${c.rhodecode_repo.alias.upper()} changeset patch
# User ${c.commit.author |n}
# Date ${c.commit.date}
# Revision ${c.commit.raw_id}
${c.commit.message |n}
%endif
${c.diff|n}