A question about Subversion and commit from the command line
Hey guys, so I want to start using the terminal when I do thinks like update, commit and whatnot. I am use to using kdesvn which is a GUI that helps me with subversion. However, kdesvn does not seem to play well on 18.04 and regardless I am trying to move away from GUI's in general. I want to commit some changes to a branch but I want to be sure that I get a report of the changes prior to the actual commit. In other words, what I want to know is if I use this command for my commit:
will it allow me to review the changes being committed? If not, how can I go about committing in such a way that it will first show me what I am about to commit (what scripts have changes) and then ask me if I am sure I want to commit?
Perhaps I should be saying:
which would work but doesn't give me the functionality I was hoping for. Perhaps the functionality I am hoping for simply doesn't exist?
solaris 10
logged in as root to command line...want to shut the system down....could not do this....when i chose shutdown the system seemed to squawk at me saying i'd lose whatever i was working on would be lost unless i logged out...after proceeding through this it took me to the gui log in... (6 Replies)
I would like to run a cvs diff to check which files have been changed and then cvs commit these changed files. Does anyone have a shell script which will automate this process? (1 Reply)
Hi ,
can u please any one of you give solution for this ..
when am tryring to commit files from the CVS in Myeclipse J2ee Environment . that i coundnt able to commit and getting the Following error message
cvs :'root' is not allowd to commit files'
am using redhat enterprise 5 Server . (1 Reply)
I'm new to Unix and I'm looking for some assistance. We have 20 different accounts we must login to every day. Logging in has become quite the chore and most nights, we have to log out. I'm looking for a way to simply copy and paste the commands into each window to make things easier.
I have been... (2 Replies)
Hi All,
I would like to ask what is the command line on OpenBSD which able to be used to check the list of library which used by specific daemon?
For example, I would like to check what are the libraries which are used by ftpd.
Thank you in advance.
Regards,
Stefan (2 Replies)
Is someone help me to achieve my goal
I am working on a script actually script is working fine .The goal of script is restrict the user for something like while he is doing tocommit in repository he will commit with comment and with some parameter....here I have one more requirement and that is... (0 Replies)
I am going through the Unix Made Easy second edition book by John Muster. So far it's been very informative and I can tell it may be a bit out of date.
In one of the exercises it talks about the "sort" command and using it to sort column's of data etc. The "sort" command has changed a bit and... (1 Reply)
:D:D:D
These are list of command i typed on opensuse terminal and evolve lots of doubt around ,that i can't answer.
COMMAND 1 linux-xavv:/ # cd
COMMAND 2 linux-xavv:~ #
Does above command 1 and command two with red labelled sign make different meaning or same .
1
linux-xavv:/... (1 Reply)
OS : RHEL / Oracle Linux 6.8
In bash shell, how can I replace a character under the cursor with another character ?
In the below example , after I typed the following line, I realized that I meant 7013 and not 2013. So I move the cursor to the left and keep it on top of 2 (of 2013) and I want... (7 Replies)
Discussion started by: kraljic
7 Replies
LEARN ABOUT DEBIAN
git-merge-base
GIT-MERGE-BASE(1) Git Manual GIT-MERGE-BASE(1)NAME
git-merge-base - Find as good common ancestors as possible for a merge
SYNOPSIS
git merge-base [-a|--all] <commit> <commit>...
git merge-base [-a|--all] --octopus <commit>...
git merge-base --independent <commit>...
DESCRIPTION
git merge-base finds best common ancestor(s) between two commits to use in a three-way merge. One common ancestor is better than another
common ancestor if the latter is an ancestor of the former. A common ancestor that does not have any better common ancestor is a best
common ancestor, i.e. a merge base. Note that there can be more than one merge base for a pair of commits.
OPERATION MODE
As the most common special case, specifying only two commits on the command line means computing the merge base between the given two
commits.
More generally, among the two commits to compute the merge base from, one is specified by the first commit argument on the command line;
the other commit is a (possibly hypothetical) commit that is a merge across all the remaining commits on the command line.
As a consequence, the merge base is not necessarily contained in each of the commit arguments if more than two commits are specified. This
is different from git-show-branch(1) when used with the --merge-base option.
--octopus
Compute the best common ancestors of all supplied commits, in preparation for an n-way merge. This mimics the behavior of git
show-branch --merge-base.
--independent
Instead of printing merge bases, print a minimal subset of the supplied commits with the same ancestors. In other words, among the
commits given, list those which cannot be reached from any other. This mimics the behavior of git show-branch --independent.
OPTIONS -a, --all
Output all merge bases for the commits, instead of just one.
DISCUSSION
Given two commits A and B, git merge-base A B will output a commit which is reachable from both A and B through the parent relationship.
For example, with this topology:
o---o---o---B
/
---o---1---o---o---o---A
the merge base between A and B is 1.
Given three commits A, B and C, git merge-base A B C will compute the merge base between A and a hypothetical commit M, which is a merge
between B and C. For example, with this topology:
o---o---o---o---C
/
/ o---o---o---B
/ /
---2---1---o---o---o---A
the result of git merge-base A B C is 1. This is because the equivalent topology with a merge commit M between B and C is:
o---o---o---o---o
/
/ o---o---o---o---M
/ /
---2---1---o---o---o---A
and the result of git merge-base A M is 1. Commit 2 is also a common ancestor between A and M, but 1 is a better common ancestor, because 2
is an ancestor of 1. Hence, 2 is not a merge base.
The result of git merge-base --octopus A B C is 2, because 2 is the best common ancestor of all commits.
When the history involves criss-cross merges, there can be more than one best common ancestor for two commits. For example, with this
topology:
---1---o---A
/
X
/
---2---o---o---B
both 1 and 2 are merge-bases of A and B. Neither one is better than the other (both are best merge bases). When the --all option is not
given, it is unspecified which best one is output.
SEE ALSO git-rev-list(1), git-show-branch(1), git-merge(1)GIT
Part of the git(1) suite
Git 1.7.10.4 11/24/2012 GIT-MERGE-BASE(1)