Home
last modified time | relevance | path

Searched refs:merged_revision (Results 1 – 25 of 87) sorted by relevance

1234

/dports/devel/monotone/monotone-1.1/test/func/resolve_conflicts_all_merge_commands/
H A D__driver__.lua28 function merged_revision() function
59 merged = merged_revision()
63 merged = merged_revision()
72 merged = merged_revision()
/dports/java/java-subversion/subversion-1.14.1/subversion/bindings/javahl/src/org/tigris/subversion/javahl/
H A DBlameCallbackImpl.java53 Date merged_date, long merged_revision, in singleLine() argument
57 addBlameLine(new BlameLine(getRevision(revision, merged_revision), in singleLine()
71 private long getRevision(long revision, long merged_revision) { in getRevision() argument
72 return (merged_revision == -1 ? revision : merged_revision); in getRevision()
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/bindings/javahl/src/org/tigris/subversion/javahl/
H A DBlameCallbackImpl.java53 Date merged_date, long merged_revision, in singleLine() argument
57 addBlameLine(new BlameLine(getRevision(revision, merged_revision), in singleLine()
71 private long getRevision(long revision, long merged_revision) { in getRevision() argument
72 return (merged_revision == -1 ? revision : merged_revision); in getRevision()
/dports/devel/p5-subversion/subversion-1.14.1/subversion/bindings/javahl/src/org/tigris/subversion/javahl/
H A DBlameCallbackImpl.java53 Date merged_date, long merged_revision, in singleLine() argument
57 addBlameLine(new BlameLine(getRevision(revision, merged_revision), in singleLine()
71 private long getRevision(long revision, long merged_revision) { in getRevision() argument
72 return (merged_revision == -1 ? revision : merged_revision); in getRevision()
/dports/devel/py-subversion/subversion-1.14.1/subversion/bindings/javahl/src/org/tigris/subversion/javahl/
H A DBlameCallbackImpl.java53 Date merged_date, long merged_revision, in singleLine() argument
57 addBlameLine(new BlameLine(getRevision(revision, merged_revision), in singleLine()
71 private long getRevision(long revision, long merged_revision) { in getRevision() argument
72 return (merged_revision == -1 ? revision : merged_revision); in getRevision()
/dports/java/java-subversion/subversion-1.14.1/subversion/svn/
H A Dblame-cmd.c61 svn_revnum_t merged_revision, in blame_receiver_xml() argument
89 if (opt_state->use_merge_history && SVN_IS_VALID_REVNUM(merged_revision)) in blame_receiver_xml()
95 svn_cl__print_xml_commit(&sb, merged_revision, in blame_receiver_xml()
175 svn_revnum_t merged_revision, in blame_receiver() argument
209 if (merged_revision < revision) in blame_receiver()
219 SVN_ERR(print_line_info(out, merged_revision, in blame_receiver()
/dports/devel/py-subversion/subversion-1.14.1/subversion/svn/
H A Dblame-cmd.c61 svn_revnum_t merged_revision, in blame_receiver_xml() argument
89 if (opt_state->use_merge_history && SVN_IS_VALID_REVNUM(merged_revision)) in blame_receiver_xml()
95 svn_cl__print_xml_commit(&sb, merged_revision, in blame_receiver_xml()
175 svn_revnum_t merged_revision, in blame_receiver() argument
209 if (merged_revision < revision) in blame_receiver()
219 SVN_ERR(print_line_info(out, merged_revision, in blame_receiver()
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/svn/
H A Dblame-cmd.c61 svn_revnum_t merged_revision, in blame_receiver_xml() argument
89 if (opt_state->use_merge_history && SVN_IS_VALID_REVNUM(merged_revision)) in blame_receiver_xml()
95 svn_cl__print_xml_commit(&sb, merged_revision, in blame_receiver_xml()
175 svn_revnum_t merged_revision, in blame_receiver() argument
209 if (merged_revision < revision) in blame_receiver()
219 SVN_ERR(print_line_info(out, merged_revision, in blame_receiver()
/dports/devel/p5-subversion/subversion-1.14.1/subversion/svn/
H A Dblame-cmd.c61 svn_revnum_t merged_revision, in blame_receiver_xml() argument
89 if (opt_state->use_merge_history && SVN_IS_VALID_REVNUM(merged_revision)) in blame_receiver_xml()
95 svn_cl__print_xml_commit(&sb, merged_revision, in blame_receiver_xml()
175 svn_revnum_t merged_revision, in blame_receiver() argument
209 if (merged_revision < revision) in blame_receiver()
219 SVN_ERR(print_line_info(out, merged_revision, in blame_receiver()
/dports/java/java-subversion/subversion-1.14.1/subversion/bindings/javahl/native/
H A DBlameCallback.h47 svn_revnum_t merged_revision,
62 svn_revnum_t merged_revision,
H A DBlameCallback.cpp60 svn_revnum_t merged_revision, in callback() argument
81 line_no, revision, rev_props, merged_revision, in callback()
/dports/devel/py-subversion/subversion-1.14.1/subversion/bindings/javahl/native/
H A DBlameCallback.h47 svn_revnum_t merged_revision,
62 svn_revnum_t merged_revision,
H A DBlameCallback.cpp60 svn_revnum_t merged_revision, in callback() argument
81 line_no, revision, rev_props, merged_revision, in callback()
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/bindings/javahl/native/
H A DBlameCallback.h47 svn_revnum_t merged_revision,
62 svn_revnum_t merged_revision,
H A DBlameCallback.cpp60 svn_revnum_t merged_revision, in callback() argument
81 line_no, revision, rev_props, merged_revision, in callback()
/dports/devel/p5-subversion/subversion-1.14.1/subversion/bindings/javahl/native/
H A DBlameCallback.h47 svn_revnum_t merged_revision,
62 svn_revnum_t merged_revision,
H A DBlameCallback.cpp60 svn_revnum_t merged_revision, in callback() argument
81 line_no, revision, rev_props, merged_revision, in callback()
/dports/java/java-subversion/subversion-1.14.1/subversion/bindings/swig/proxy/
H A Dsvn_client_h.swg137 … line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *…
138 …return _obj(baton, line_no, revision, rev_props, merged_revision, merged_rev_props, merged_path, l…
142 … line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *…
143 …return _obj(baton, start_revnum, end_revnum, line_no, revision, rev_props, merged_revision, merged…
147 …evnum_t revision, const char *author, const char *date, svn_revnum_t merged_revision, const char *…
148 …return _obj(baton, line_no, revision, author, date, merged_revision, merged_author, merged_date, m…
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/bindings/swig/proxy/
H A Dsvn_client_h.swg137 … line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *…
138 …return _obj(baton, line_no, revision, rev_props, merged_revision, merged_rev_props, merged_path, l…
142 … line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *…
143 …return _obj(baton, start_revnum, end_revnum, line_no, revision, rev_props, merged_revision, merged…
147 …evnum_t revision, const char *author, const char *date, svn_revnum_t merged_revision, const char *…
148 …return _obj(baton, line_no, revision, author, date, merged_revision, merged_author, merged_date, m…
/dports/devel/p5-subversion/subversion-1.14.1/subversion/bindings/swig/proxy/
H A Dsvn_client_h.swg137 … line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *…
138 …return _obj(baton, line_no, revision, rev_props, merged_revision, merged_rev_props, merged_path, l…
142 … line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *…
143 …return _obj(baton, start_revnum, end_revnum, line_no, revision, rev_props, merged_revision, merged…
147 …evnum_t revision, const char *author, const char *date, svn_revnum_t merged_revision, const char *…
148 …return _obj(baton, line_no, revision, author, date, merged_revision, merged_author, merged_date, m…
/dports/devel/py-subversion/subversion-1.14.1/subversion/bindings/swig/proxy/
H A Dsvn_client_h.swg137 … line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *…
138 …return _obj(baton, line_no, revision, rev_props, merged_revision, merged_rev_props, merged_path, l…
142 … line_no, svn_revnum_t revision, apr_hash_t *rev_props, svn_revnum_t merged_revision, apr_hash_t *…
143 …return _obj(baton, start_revnum, end_revnum, line_no, revision, rev_props, merged_revision, merged…
147 …evnum_t revision, const char *author, const char *date, svn_revnum_t merged_revision, const char *…
148 …return _obj(baton, line_no, revision, author, date, merged_revision, merged_author, merged_date, m…
/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_ra_serf/
H A Dblame.c145 const char *merged_revision; in blame_opened() local
154 merged_revision = svn_hash_gets(gathered, "merged-revision"); in blame_opened()
159 merged_revision != NULL, in blame_opened()
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_ra_serf/
H A Dblame.c145 const char *merged_revision; in blame_opened() local
154 merged_revision = svn_hash_gets(gathered, "merged-revision"); in blame_opened()
159 merged_revision != NULL, in blame_opened()
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_ra_serf/
H A Dblame.c145 const char *merged_revision; in blame_opened() local
154 merged_revision = svn_hash_gets(gathered, "merged-revision"); in blame_opened()
159 merged_revision != NULL, in blame_opened()
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_ra_serf/
H A Dblame.c145 const char *merged_revision; in blame_opened() local
154 merged_revision = svn_hash_gets(gathered, "merged-revision"); in blame_opened()
159 merged_revision != NULL, in blame_opened()

1234